2024/6/17

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 2301
+		userAdmin.Id = 4522
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 2301 //4，809
+		userAdmin.Id = 4522 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id
+		subscibe.OrgId = 10028 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 2301
+		userAdmin.Id = 4522
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 2301 //4，809
+		userAdmin.Id = 4522 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10028 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2858,7 +2858,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10731 || adminUserInfo.CurrentOrgId == 10727 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
@@ -3227,8 +3227,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 {
-				if adminUserInfo.CurrentOrgId != 10551 {
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3505,12 +3505,14 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
 					dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
-
+					if adminUserInfo.CurrentOrgId == 10751 {
+						dewater_amount = dewater_amount * 1000
+					}
 					service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
 				}
 			}
@@ -3519,7 +3521,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
 					dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
-
+					if adminUserInfo.CurrentOrgId == 10751 {
+						dewater_amount = dewater_amount * 1000
+					}
 					service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 				}
 			}
@@ -6004,8 +6008,13 @@ func (c *DialysisApiController) UploadDryWeight() {
 				var dewater_amount float64
 
 				dewater_amount = beforAssesment.WeightBefore - dry_weight - beforAssesment.AdditionalWeight
+				if adminUserInfo.CurrentOrgId != 10702 {
+					service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
+				}
+				if adminUserInfo.CurrentOrgId == 10702 {
+					service.UpdatePatientDialysisPrscriptionOne(dialysisPrescription.ID, dewater_amount)
+				}
 
-				service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(timeNewDate.Unix(), 10) + ":" + strconv.FormatInt(dialysisPrescription.ModeId, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()

controllers/dialysis_record_api_controller.go

@@ -87,6 +87,8 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 		redis.Set(key, scheduals_json_str, time.Second*60)
 	}
 
+	redis.Set(key, "", time.Second)
+
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 
 		scheduals, err := service.GetDialysisSchedualsOne(orgID, date.Unix())
@@ -111,6 +113,8 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
 
+				solution, _ := service.GetDialysisSolutionByDate(orgID)
+
 				for key, item := range scheduals {
 
 					for _, infor := range inforMation {
@@ -173,6 +177,12 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 							break
 						}
 					}
+
+					for _, solut := range solution {
+						if solut.PatientId == item.PatientId && solut.ModeId == item.ModeId {
+							scheduals[key].DialysisSolution = solut
+						}
+					}
 				}
 
 				//缓存数据

controllers/doctors_api_controller.go

@@ -372,7 +372,12 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 
 			dewater_amount = beforAssesment.WeightBefore - dry_weight - beforAssesment.AdditionalWeight
 
-			service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
+			if adminUserInfo.CurrentOrgId != 10702 {
+				service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
+			}
+			if adminUserInfo.CurrentOrgId == 10702 {
+				service.UpdatePatientDialysisPrscriptionOne(dialysisPrescription.ID, dewater_amount)
+			}
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(timeNewDate.Unix(), 10) + ":" + strconv.FormatInt(dialysisPrescription.ModeId, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()

controllers/drug_pharmacy_management_controller.go

@@ -46,9 +46,11 @@ func (this *PharmacyApiController) GetTodayAdviceList() {
 	//获取药房发药药品库数据
 	appId := this.GetAdminUserInfo().CurrentAppId
 	doctorlist, err := service.GetAllDoctorSix(orgId, appId)
+	drug, _ := service.GetAllBaseDrugList(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"doctorlist": doctorlist,
+			"drug":       drug,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/drug_stock_api_contorller.go

@@ -3169,6 +3169,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	order_type, _ := c.GetInt64("order_type")
 
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	drug_id, _ := c.GetInt64("drug_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -3195,7 +3196,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 1 {
-		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId, storehouse_id)
+		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId, storehouse_id, drug_id)
 		manufacturerList, _ := service.GetAllManufacturerList(orgId)
 		dealerList, _ := service.GetAllDealerList(orgId)
 		if err == nil {
@@ -3215,6 +3216,8 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	end_time := c.GetString("end_time")
 	order_type, _ := c.GetInt64("order_type")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	drug_id, _ := c.GetInt64("drug_id")
+	order_way, _ := c.GetInt64("order_way")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -3243,7 +3246,7 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	dealerList, _ := service.GetAllDealerList(orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if order_type == 2 {
-		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId, storehouse_id)
+		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId, storehouse_id, drug_id, order_way)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list":             list,
@@ -3388,6 +3391,20 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			DrugCode:                item.DrugCode,
 		}
 		service.CreateNewDrugFlowTwo(flow, tx)
+
+		infoLog := models.XtDrugWarehouseInfoLog{
+
+			DrugId:          item.DrugId,
+			WarehouseInfoId: item.ID,
+			RecordDate:      time.Now().Unix(),
+			UserOrgId:       item.OrgId,
+			Status:          1,
+			Ctime:           time.Now().Unix(),
+			Mtime:           time.Now().Unix(),
+		}
+
+		service.CreateInfoLog(infoLog, tx)
+
 		//更新基础库剩余库存
 		service.UpdateNewMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId, tx)
 
@@ -3569,7 +3586,7 @@ func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
 
 func (c *StockDrugApiController) CheckDrugOut() {
 
-	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+	warehouseOutId, _ := c.GetInt64("warehouse_out_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	// 开始外部循环的事务
 	db := service.XTWriteDB()
@@ -3582,8 +3599,8 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		}
 	}()
 
-	warehousingOutInfoList, _ := service.GetNewDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
-	drugWarehouseOut, _ := service.GetNewDrugWarehouseOutByLastId(warehouse_out_id, tx)
+	warehousingOutInfoList, _ := service.GetNewDrugWarehouseOutListById(warehouseOutId, orgId, tx)
+	drugWarehouseOut, _ := service.GetNewDrugWarehouseOutByLastId(warehouseOutId, tx)
 
 	for _, it := range warehousingOutInfoList {
 		var total_count int64
@@ -3628,7 +3645,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			return
 		}
 	}
-	warehousingOutInfoListTwo, _ := service.GetNewDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
+	warehousingOutInfoListTwo, _ := service.GetNewDrugWarehouseOutListById(warehouseOutId, orgId, tx)
 
 	for _, it := range warehousingOutInfoListTwo {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
@@ -3650,7 +3667,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		service.AddNewDrugCount(it.DrugId, it.OrgId, it.StorehouseId, out_count_one, tx)
 
 	}
-	warehousingOutInfoListThree, _ := service.GetNewDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
+	warehousingOutInfoListThree, _ := service.GetNewDrugWarehouseOutListById(warehouseOutId, orgId, tx)
 
 	var is_success = 2
 	for _, it := range warehousingOutInfoListThree {
@@ -3699,7 +3716,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			}
 
 			var flow_count int64
-
+			var flow_count_one int64
 			//查询该药品的出库数量
 			drugflowlist, _ := service.GetDrugOutFlowByWarehouseOut(it.DrugId, it.ID, it.OrgId, tx)
 			if len(drugflowlist) > 0 {
@@ -3707,17 +3724,20 @@ func (c *StockDrugApiController) CheckDrugOut() {
 
 					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 						flow_count = items.Count * medical.MinNumber
+						flow_count_one += flow_count
 					}
 					if items.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 						flow_count = items.Count
+						flow_count_one += flow_count
 					}
 					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 						flow_count = items.Count
+						flow_count_one += flow_count
 					}
 				}
 			}
 
-			if now_count != flow_count {
+			if now_count != flow_count_one {
 				is_success = 1
 				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
@@ -3731,7 +3751,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		IsCheck: 1,
 	}
 	//更新审核状态
-	service.UpdateNewCheckDrugOut(out, warehouse_out_id, tx)
+	service.UpdateNewCheckDrugOut(out, warehouseOutId, tx)
 
 	//查询
 	if is_success != 1 {
@@ -3883,6 +3903,8 @@ func (c *StockDrugApiController) ToReturnCheck() {
 
 		service.UpdateNewDrugStockCount(item.DrugId, item.OrgId, item.StorehouseId, over_count, tx)
 
+		service.UpdateDrugWarehouseOutInfoLog(item.ID, item.DrugId, tx)
+
 	}
 	tx.Commit()
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/gobal_config_api_controller.go

@@ -1734,6 +1734,7 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	drug_id, _ := c.GetInt64("drug_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1763,7 +1764,7 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
 
-	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id, drug_id)
 
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
@@ -1858,7 +1859,9 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+	drug_id, _ := c.GetInt64("drug_id")
+	order_way, _ := c.GetInt64("order_way")
+	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id, drug_id, order_way)
 
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	patientsList, _ := service.GetAllpatient(adminInfo.CurrentOrgId)
@@ -1911,8 +1914,9 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, storehouse_id)
-	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+	drug_id, _ := c.GetInt64("drug_id")
+	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, storehouse_id, drug_id)
+	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id, drug_id)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)

controllers/inspection_api_controller.go

@@ -1142,7 +1142,6 @@ func (c *InspectionApiController) EditPatientNewInspection() {
 
 	inspection.ID = id
 
-	fmt.Println("id------------------------------", id)
 }
 
 func (c *InspectionApiController) GetInpsectionByPatientGroup() {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -326,7 +326,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10727 {
+	if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 {
 		dewater_amount = dewater_amount * 1000
 	}
 
@@ -930,6 +930,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 
+				if adminUserInfo.Org.Id == 10742 {
+					evaluation.BeforSymptoms = lastPredialysisEvaluation.BeforSymptoms
+				}
+
 				if adminUserInfo.Org.Id == 10702 {
 					evaluation.PreDialysisDrugs = "无"
 				}
@@ -977,7 +981,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10745 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -570,11 +570,11 @@ func (this *DialysisAPIController) DialysisRecord() {
 	//var index int64 = 0
 	for _, item := range temp_team_projects {
 		//组套里面非检验项目的
-		if item.HisProject.CostClassify != 3 {
+		if item.HisProject.CostClassify != 3 && item.HisProject.CostClassify != 104 {
 			projects = append(projects, item)
 		}
 		//组套里面检验项目的
-		if item.HisProject.CostClassify == 3 {
+		if item.HisProject.CostClassify == 3 || item.HisProject.CostClassify == 104 {
 			team_projects = append(team_projects, item)
 		}
 	}
@@ -3051,7 +3051,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 || adminUserInfo.Org.Id == 10742 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 		if adminUserInfo.Org.Id != 10702 {
@@ -3687,6 +3687,15 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 
+	if adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10164 {
+
+		record, _ := service.GetDialysisPrescriptionByRecord(adminUserInfo.Org.Id, patientID, schedulestartTime)
+		if record.ID == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
+			return
+		}
+	}
+
 	//查询该床位是否有人用了
 	order, _ := service.GetDialysisOrderByBedIdTwo(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 
@@ -3980,11 +3989,16 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
-			if adminUserInfo.Org.Id == 10644 {
+			if adminUserInfo.Org.Id == 10644 || adminUserInfo.Org.Id == 10751 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10751 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 			if adminUserInfo.Org.Id == 10667 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4103,7 +4117,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 || adminUserInfo.Org.Id == 10742 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
@@ -5276,6 +5290,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
+			if adminInfo.Org.Id == 10751 {
+
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+
+			}
+
 			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 || adminInfo.Org.Id == 10629 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
@@ -5379,6 +5400,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
+	if adminInfo.Org.Id == 10751 {
+
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
+
 	if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 {
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
@@ -6733,8 +6761,13 @@ func (c *DialysisAPIController) UploadDryWeight() {
 				var dewater_amount float64
 
 				dewater_amount = beforAssesment.WeightBefore - dry_weight - beforAssesment.AdditionalWeight
+				if adminUserInfo.Org.Id != 10702 {
+					service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
+				}
+				if adminUserInfo.Org.Id == 10702 {
+					service.UpdatePatientDialysisPrscriptionOne(dialysisPrescription.ID, dewater_amount)
+				}
 
-				service.UpdatePatientDialysisPrscription(dialysisPrescription.ID, dewater_amount)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(timeNewDate.Unix(), 10) + ":" + strconv.FormatInt(dialysisPrescription.ModeId, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -12126,7 +12159,7 @@ func (c *DialysisAPIController) SaveSelfChildDrugLongAdivce() {
 		StopTime:              0,
 		StopReason:            "",
 		StopDoctor:            0,
-		StopState:             0,
+		StopState:             2,
 		ParentId:              parent_id,
 		ExecutionTime:         0,
 		ExecutionStaff:        0,
@@ -12610,6 +12643,8 @@ func (c *DialysisAPIController) SaveLongAdviceTemplate() {
 
 		advice.AdviceDoctor = advice_doctor
 
+		advice.StopState = 2
+
 		advices = append(advices, &advice)
 	}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -676,13 +676,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 
-			fmt.Println("advices---------------------------------------------", advices)
 			for _, item := range advices {
 
 				//自备药
 				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
 
 				if selfPrescriptionOutOpenOne.IsOpen == 1 {
+
 					//查询库存是否
 					selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
 
@@ -709,15 +709,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 							prescribing_number_total_one = count
 						}
-						if prescribing_number_total_one > selfDrugStockCount.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "2",
-								"advice": advice,
-								"ids":    ids,
-							})
-							return
+						if advice.UserOrgId != 10164 && advice.UserOrgId != 10744 {
+
+							if prescribing_number_total_one > selfDrugStockCount.FlushCount {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
 
+							}
 						}
+
 					}
 
 				}
@@ -770,6 +774,18 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}()
 
+					if strings.Contains(item.AdviceName, "自备") {
+						fmt.Println("hahhahahahahhh")
+						if item.DrugId == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "12",
+								"advice": item,
+								"ids":    ids,
+							})
+							return
+						}
+					}
+
 					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
 
 					if selfBasedrug.IsSelfDrug == 1 {
@@ -787,13 +803,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							total_count += items.StockMaxNumber + items.StockMinNumber
 						}
 
-						if total_count == 0 {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "2",
-								"advice": item,
-								"ids":    ids,
-							})
-							return
+						if item.UserOrgId != 10740 && item.UserOrgId != 10164 {
+							if total_count == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": item,
+									"ids":    ids,
+								})
+								return
+							}
 						}
 
 						//判断单位是否相等
@@ -818,16 +836,126 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						}
 
-						if prescribing_number_total > total_count {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "3",
-								"advice": item,
-							})
-							return
+						if item.UserOrgId != 10740 && item.UserOrgId != 10164 {
+
+							if prescribing_number_total > total_count {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "3",
+									"advice": item,
+								})
+								return
+							}
 						}
+
 						var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
-						//出库
-						if prescribing_number_total <= total_count {
+
+						if item.UserOrgId != 10164 {
+							//出库
+							if prescribing_number_total <= total_count {
+								timeStr := time.Now().Format("2006-01-02")
+								timeArr := strings.Split(timeStr, "-")
+								total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
+
+								total = total + 1
+								warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 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 := c.GetMobileAdminUserInfo().AdminUser.Id
+								//创建一个出库单
+								drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+									WarehouseOutOrderNumber: warehousing_out_order,
+									OperationTime:           operation_time,
+									OrgId:                   adminUserInfo.Org.Id,
+									Creater:                 creater,
+									Ctime:                   time.Now().Unix(),
+									Status:                  1,
+									WarehouseOutTime:        item.AdviceDate,
+									Type:                    0,
+									PatientId:               advice.PatientId,
+									IsCheck:                 1,
+									IsSys:                   1,
+								}
+
+								//查询今日是否有出库数据
+								lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+								if lastWarehouseOut.ID == 0 {
+									service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+								}
+
+								//查询今日是否有出库数据
+								lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+								var warehousing_out_order_str string
+								if lastWarehouseOut.ID == 0 {
+									warehousing_out_order_str = warehousing_out_order
+								} else {
+									warehousing_out_order_str = lastWarehouseOut.WarehouseOutOrderNumber
+								}
+
+								//出库
+								warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+									WarehouseOutId:          lastWarehouseOutOne.ID,
+									WarehouseOutOrderNumber: warehousing_out_order_str,
+									DrugId:                  item.DrugId,
+									Count:                   prescribing_number_total,
+									Price:                   0,
+									TotalPrice:              0,
+									Status:                  1,
+									Ctime:                   item.AdviceDate,
+									Mtime:                   item.AdviceDate,
+									Remark:                  "",
+									OrgId:                   item.UserOrgId,
+									Type:                    0,
+									Manufacturer:            selfBasedrug.Manufacturer,
+									Dealer:                  selfBasedrug.Dealer,
+									RetailPrice:             0,
+									RetailTotalPrice:        0,
+									CountUnit:               selfBasedrug.MinUnit,
+									ExpiryDate:              0,
+									ProductDate:             0,
+									Number:                  "",
+									BatchNumber:             "",
+									IsSys:                   0,
+									WarehouseInfoId:         0,
+									AdminUserId:             0,
+									StockCount:              "",
+									IsCheck:                 1,
+									SysRecordTime:           item.AdviceDate,
+									PatientId:               item.PatientId,
+									AdviceId:                item.ID,
+									ClassType:               "",
+								}
+								warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+								for _, it := range warehousingOutInfo {
+
+									medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+									drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+
+									//出库逻辑
+									service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+									//查询剩余库存
+									stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+									var sum_count int64
+									for _, its := range stockInfo {
+										if its.MaxUnit == medical.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
+									}
+									service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+								}
+							}
+						}
+
+						//重庆
+						if item.UserOrgId == 10164 {
+							//出库
 							timeStr := time.Now().Format("2006-01-02")
 							timeArr := strings.Split(timeStr, "-")
 							total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
@@ -911,8 +1039,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 								drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+
 								//出库逻辑
-								service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+								service.AutoNewSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
 
 								//查询剩余库存
 								stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
@@ -925,6 +1054,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
 							}
+
 						}
 
 					}
@@ -967,14 +1097,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 							prescribing_number_total_one = count
 						}
-						if prescribing_number_total_one > selfDrugStockCount.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "2",
-								"advice": advice,
-								"ids":    ids,
-							})
-							return
+
+						if advice.UserOrgId != 10164 && advice.UserOrgId != 10740 {
+
+							if prescribing_number_total_one > selfDrugStockCount.FlushCount {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 						}
+
 					}
 
 				}
@@ -1027,13 +1162,16 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							total_count += items.StockMaxNumber + items.StockMinNumber
 						}
 
-						if total_count == 0 {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "2",
-								"advice": item,
-								"ids":    ids,
-							})
-							return
+						if item.UserOrgId != 10740 && item.UserOrgId != 10164 {
+
+							if total_count == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": item,
+									"ids":    ids,
+								})
+								return
+							}
 						}
 
 						//判断单位是否相等
@@ -1058,16 +1196,126 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						}
 
-						if prescribing_number_total > total_count {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":    "3",
-								"advice": item,
-							})
-							return
+						if item.UserOrgId != 10164 && item.UserOrgId != 10740 {
+							if prescribing_number_total > total_count {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "3",
+									"advice": item,
+								})
+								return
+							}
 						}
+
 						var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
-						//出库
-						if prescribing_number_total <= total_count {
+
+						if item.UserOrgId != 10164 && item.UserOrgId != 10740 {
+
+							//出库
+							if prescribing_number_total <= total_count {
+								timeStr := time.Now().Format("2006-01-02")
+								timeArr := strings.Split(timeStr, "-")
+								total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
+
+								total = total + 1
+								warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 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 := c.GetMobileAdminUserInfo().AdminUser.Id
+
+								//创建一个出库单
+								drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+									WarehouseOutOrderNumber: warehousing_out_order,
+									OperationTime:           operation_time,
+									OrgId:                   adminUserInfo.Org.Id,
+									Creater:                 creater,
+									Ctime:                   time.Now().Unix(),
+									Status:                  1,
+									WarehouseOutTime:        item.AdviceDate,
+									Type:                    0,
+									PatientId:               advice.PatientId,
+									IsCheck:                 1,
+									IsSys:                   1,
+								}
+
+								//查询今日是否有出库数据
+								lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+								if lastWarehouseOut.ID == 0 {
+									service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+								}
+
+								//查询今日是否有出库数据
+								lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+								var warehousing_out_order_str string
+								if lastWarehouseOut.ID == 0 {
+									warehousing_out_order_str = warehousing_out_order
+								} else {
+									warehousing_out_order_str = lastWarehouseOut.WarehouseOutOrderNumber
+								}
+
+								//出库
+								warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+									WarehouseOutId:          lastWarehouseOutOne.ID,
+									WarehouseOutOrderNumber: warehousing_out_order_str,
+									DrugId:                  item.DrugId,
+									Count:                   prescribing_number_total,
+									Price:                   0,
+									TotalPrice:              0,
+									Status:                  1,
+									Ctime:                   item.AdviceDate,
+									Mtime:                   item.AdviceDate,
+									Remark:                  "",
+									OrgId:                   item.UserOrgId,
+									Type:                    0,
+									Manufacturer:            selfBasedrug.Manufacturer,
+									Dealer:                  selfBasedrug.Dealer,
+									RetailPrice:             0,
+									RetailTotalPrice:        0,
+									CountUnit:               selfBasedrug.MinUnit,
+									ExpiryDate:              0,
+									ProductDate:             0,
+									Number:                  "",
+									BatchNumber:             "",
+									IsSys:                   0,
+									WarehouseInfoId:         0,
+									AdminUserId:             0,
+									StockCount:              "",
+									IsCheck:                 1,
+									SysRecordTime:           item.AdviceDate,
+									PatientId:               item.PatientId,
+									AdviceId:                item.ID,
+									ClassType:               "",
+								}
+								warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+								for _, it := range warehousingOutInfo {
+
+									medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+									drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+									//出库逻辑
+									service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+									//查询剩余库存
+									stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+									var sum_count int64
+									for _, its := range stockInfo {
+										if its.MaxUnit == medical.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
+									}
+									service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+								}
+							}
+						}
+
+						//重庆
+						if item.UserOrgId == 10164 || item.UserOrgId == 10740 {
+
 							timeStr := time.Now().Format("2006-01-02")
 							timeArr := strings.Split(timeStr, "-")
 							total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
@@ -1153,7 +1401,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 								drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 								//出库逻辑
-								service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+								service.AutoNewSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
 
 								//查询剩余库存
 								stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
@@ -1167,7 +1415,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
 							}
 						}
-
 					}
 
 				}
@@ -1187,8 +1434,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//针对普宁
 		if adminUserInfo.Org.Id != 10599 {
-			fmt.Println("开始时间--------------------", advice.StartTime)
-			fmt.Println("theTime---------------------", theTime.Unix())
+
 			if advice.StartTime > theTime.Unix() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 				return
@@ -2814,6 +3060,19 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			Mtime:         time.Now().Unix(),
 		}
 		service.ModifyHisPrescriptionProject(&project, ids)
+
+		if adminUserInfo.Org.Id == 10644 {
+			projectList, _ := service.GetHisPrescriptionProjectByIds(ids)
+			if len(projectList) > 0 {
+				for _, item := range projectList {
+					if item.TeamId > 0 {
+						service.ModfifyProjectListByIds(item.TeamId, theTime.Unix(), item.RecordDate, item.PatientId)
+					}
+
+				}
+			}
+		}
+
 		//记录日志
 		projectquerst, _ := json.Marshal(project)
 		projectLog := models.XtDoctorAdviceLog{
@@ -3494,7 +3753,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 {
 
 			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 {
 				dewater_amount = dewater_amount * 1000
@@ -4219,11 +4478,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				if adminUserInfo.Org.Id == 10751 {
+					dewater_amount = dewater_amount * 1000
+				}
 				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
 			}
 		}
@@ -4232,14 +4494,17 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				if adminUserInfo.Org.Id == 10751 {
+					dewater_amount = dewater_amount * 1000
+				}
 				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 			}
 		}
 
 	}
 
-	//古镇乐生
-	if adminUserInfo.Org.Id == 10731 {
+	// 小尹
+	if adminUserInfo.Org.Id == 10164 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
@@ -4302,7 +4567,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//揭阳
-	if adminUserInfo.Org.Id == 10597 {
+	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
@@ -4312,7 +4577,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		}
 	}
 
-	if adminUserInfo.Org.Id == 10597 {
+	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 {
 
 		if evaluation.ID > 0 {
 
@@ -6985,6 +7250,7 @@ func (c *PatientApiController) ExecProject() {
 				ids = append(ids, items.ID)
 			}
 			err := service.UpdateTeamProjectExceStatus(ids, adminInfo.AdminUser.Id, theTime.Unix())
+
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"project": project,

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -71,7 +71,6 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
 
-		fmt.Println("dialysisSchedule------------------------", dialysisSchedule)
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -1,10 +1,6 @@
 package new_mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"math/rand"
@@ -12,6 +8,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
 )
 
 type MobileHisApiController struct {
@@ -328,6 +329,7 @@ func (c *MobileHisApiController) DeletePrescription() {
 	}
 }
 func (c *MobileHisApiController) DeleteDoctorAdvice() {
+
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 	err := service.DelelteDoctorAdvice(id, c.GetMobileAdminUserInfo().Org.Id)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1398,6 +1398,8 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 
 	deathtime := dataBody["death_time"].(string)
 
+	fmt.Println("deathTime=-------------------", deathtime)
+
 	deathtimes, err := time.ParseInLocation(timeLayouts+" 15:04:05", deathtime+" 00:00:00", loc)
 	//times, err := utils.ParseTimeStringToTime(timeLayout, fistdate+"00:00:00")
 	death_time := deathtimes.Unix()

controllers/print_data_api_controller.go

@@ -162,18 +162,28 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				if this.GetAdminUserInfo().CurrentOrgId == 10445 {
-					if item.ScheduleDate <= 1703952000 {
+
+					if item.ScheduleDate >= 1640966400 && item.ScheduleDate <= 1672416000 {
+						listOne, _ := service.GetDialysisOrderCountNewTen(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+						item.Patient.TotalDialysis = listOne.Count
+						item.Count = listOne.Count
+					}
+
+					if item.ScheduleDate >= 1672502400 && item.ScheduleDate <= 1703952000 {
+						listOne, _ := service.GetDialysisOrderCountTwenty(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+						item.Patient.TotalDialysis = listOne.Count
+						item.Count = listOne.Count
+					}
+
+					if item.ScheduleDate >= 1704038400 && item.ScheduleDate <= 1735574400 {
+
 						listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 						item.Patient.TotalDialysis = listOne.Count
 						item.Count = listOne.Count
 					}
 
-					if item.ScheduleDate >= 1704038400 {
-						fmt.Println("寄哪里地方阿道夫阿道夫")
-						//listOrder, _ := service.GetDialysisOrderCountNight(item.PatientID, item.ScheduleDate)
-						//fmt.Println("")
-						//item.Count = listOrder.DialysisTotal
+					if item.ScheduleDate >= 1735660800 {
 
 						listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
@@ -339,8 +349,11 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	storehouse_id, _ := this.GetInt64("storehouse_id")
+	good_id, _ := this.GetInt64("good_id")
 	adminUserInfo := this.GetAdminUserInfo()
 
+	order_way, _ := this.GetInt64("order_way")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -367,7 +380,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 
 	//入库详情
 	if types == 1 {
-		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page, storehouse_id)
+		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page, storehouse_id, good_id)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -380,9 +393,9 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	//出库详情
 	if types == 2 {
 		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
-		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
+		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, good_id, order_way)
 
-		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
+		stockTotal, err := service.GetOutStockTotalCountThree(startTime, endTime, adminUserInfo.CurrentOrgId, good_id)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

controllers/schedule_api_controller.go

@@ -4859,7 +4859,7 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	}
 
 	//查询排班里面的空透析器
-	if adminInfo.CurrentOrgId == 10375 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 9538 {
+	if adminInfo.CurrentOrgId == 10375 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 9538 || adminInfo.CurrentOrgId == 10742 || adminInfo.CurrentOrgId == 10387 || adminInfo.CurrentOrgId == 10740 {
 
 		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 
@@ -4877,8 +4877,12 @@ func (c *ScheduleApiController) GetScheduleOne() {
 				if len(solution.DialysisIrrigation) > 0 {
 					DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
 				}
+				if len(solution.DialysisStrainer) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + solution.DialysisStrainer
+				}
 				item.DialysisMachineName = DialysisMachineName
 				service.UpdateSchOne(item.ID, item.DialysisMachineName)
+
 			}
 			if item.ScheduleDate < timeNewDate.Unix() {
 				prescriptionList, _ := service.GetDialysisPrescriptionList(item.PatientId, item.UserOrgId, item.ScheduleDate)
@@ -4893,6 +4897,9 @@ func (c *ScheduleApiController) GetScheduleOne() {
 				if len(prescriptionList.DialysisIrrigation) > 0 {
 					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialysisIrrigation
 				}
+				if len(prescriptionList.DialysisStrainer) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + prescriptionList.DialysisStrainer
+				}
 				item.DialysisMachineName = DialysisMachineName
 				service.UpdateSchOne(item.ID, item.DialysisMachineName)
 			}

controllers/self_drug_api_congtroller.go

@@ -4079,6 +4079,8 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 
 	limit, _ := this.GetInt64("limit")
 
+	fmt.Println("lismt", limit)
+
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	orgId := this.GetAdminUserInfo().CurrentOrgId

controllers/sign_api_controller.go

@@ -1296,6 +1296,149 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	}
 	//}
 
+	//advice, _ := service.GetDoctorAdviceListByUserOrgId(10740, 1736179200)
+	//
+	//db := service.XTWriteDB()
+	//tx := db.Begin()
+	//defer func() {
+	//	if r := recover(); r != nil {
+	//		tx.Rollback()
+	//	} else {
+	//		tx.Commit()
+	//	}
+	//}()
+	//for _, item := range advice {
+	//
+	//	//查找该患者是否出库了
+	//	outInfo, _ := service.GetSelfDrugWarehouseOutInfo(item.PatientId, item.DrugId, item.AdviceDate)
+	//	if outInfo.ID == 0 {
+	//		timeStr := time.Now().Format("2006-01-02")
+	//		timeArr := strings.Split(timeStr, "-")
+	//		total, _ := service.FindAllSelfDrugWarehouseOut(10740, tx)
+	//
+	//		total = total + 1
+	//		warehousing_out_order := strconv.FormatInt(10740, 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 := this.GetAdminUserInfo().AdminUser.Id
+	//
+	//		//创建一个出库单
+	//		drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+	//			WarehouseOutOrderNumber: warehousing_out_order,
+	//			OperationTime:           operation_time,
+	//			OrgId:                   10740,
+	//			Creater:                 creater,
+	//			Ctime:                   time.Now().Unix(),
+	//			Status:                  1,
+	//			WarehouseOutTime:        item.AdviceDate,
+	//			Type:                    0,
+	//			PatientId:               item.PatientId,
+	//			IsCheck:                 1,
+	//			IsSys:                   1,
+	//		}
+	//
+	//		//查询今日是否有出库数据
+	//		lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(10740, item.AdviceDate, tx, 1)
+	//
+	//		if lastWarehouseOut.ID == 0 {
+	//			service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+	//		}
+	//
+	//		//查询今日是否有出库数据
+	//		lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(10740, item.AdviceDate, tx, 1)
+	//
+	//		var warehousing_out_order_str string
+	//		if lastWarehouseOut.ID == 0 {
+	//			warehousing_out_order_str = warehousing_out_order
+	//		} else {
+	//			warehousing_out_order_str = lastWarehouseOut.WarehouseOutOrderNumber
+	//		}
+	//
+	//		//查询库存是否
+	//		selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(item.DrugId, item.UserOrgId)
+	//		var prescribing_number_total_one int64
+	//		//判断单位是否相等
+	//		if selfBasedrug.MaxUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+	//			prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+	//			count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+	//			//转化为最小单位
+	//			prescribing_number_total_one = count * selfBasedrug.MinNumber
+	//		}
+	//
+	//		if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+	//			prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+	//			count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+	//			prescribing_number_total_one = count
+	//
+	//		}
+	//
+	//		if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+	//			prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+	//			count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+	//			prescribing_number_total_one = count
+	//		}
+	//
+	//		//出库
+	//		warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+	//			WarehouseOutId:          lastWarehouseOutOne.ID,
+	//			WarehouseOutOrderNumber: warehousing_out_order_str,
+	//			DrugId:                  item.DrugId,
+	//			Count:                   prescribing_number_total_one,
+	//			Price:                   0,
+	//			TotalPrice:              0,
+	//			Status:                  1,
+	//			Ctime:                   item.AdviceDate,
+	//			Mtime:                   item.AdviceDate,
+	//			Remark:                  "",
+	//			OrgId:                   item.UserOrgId,
+	//			Type:                    0,
+	//			Manufacturer:            selfBasedrug.Manufacturer,
+	//			Dealer:                  selfBasedrug.Dealer,
+	//			RetailPrice:             0,
+	//			RetailTotalPrice:        0,
+	//			CountUnit:               selfBasedrug.MinUnit,
+	//			ExpiryDate:              0,
+	//			ProductDate:             0,
+	//			Number:                  "",
+	//			BatchNumber:             "",
+	//			IsSys:                   0,
+	//			WarehouseInfoId:         0,
+	//			AdminUserId:             0,
+	//			StockCount:              "",
+	//			IsCheck:                 1,
+	//			SysRecordTime:           item.AdviceDate,
+	//			PatientId:               item.PatientId,
+	//			AdviceId:                item.ID,
+	//			ClassType:               "",
+	//		}
+	//		var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+	//		warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+	//
+	//		for _, it := range warehousingOutInfo {
+	//
+	//			medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+	//			drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+	//			//出库逻辑
+	//			service.AutoNewSelfDrugDeliverInfoFourtyTwo(item.UserOrgId, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+	//
+	//			//查询剩余库存
+	//			stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+	//			var sum_count int64
+	//			for _, its := range stockInfo {
+	//				if its.MaxUnit == medical.MaxUnit {
+	//					its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+	//				}
+	//				sum_count += its.StockMaxNumber + its.StockMinNumber
+	//			}
+	//			service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+	//		}
+	//	}
+	//}
+	//tx.Commit()
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

controllers/stock_in_api_controller.go

@@ -2957,6 +2957,10 @@ func (this *StockManagerApiController) GetDetailInfo() {
 
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 
+	good_id, _ := this.GetInt64("good_id")
+
+	order_way, _ := this.GetInt64("order_way")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -2993,9 +2997,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	patientsList, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)
+	var goodKind = "耗材种类"
+	goodKindParent, _ := service.GetDrugDataConfig(0, goodKind)
+	goodKindList, _ := service.GetParentDataConfig(goodKindParent.ID, adminUserInfo.CurrentOrgId)
 	if types == 1 {
-		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
-		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
+		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -3006,14 +3013,15 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
 				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
 
 	} else if types == 2 {
-		list1, total, err = service.FindStockOutDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
-		_, total_price = service.GetStockOutDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
+		list1, total, err = service.FindStockOutDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id, order_way)
+		_, total_price = service.GetStockOutDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id, order_way)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":             list1,
@@ -3023,6 +3031,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
 				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3037,13 +3046,14 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
 				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
 	} else if types == 4 {
-		list3, total, err = service.FindCancelDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
-		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
+		list3, total, err = service.FindCancelDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":             list3,
@@ -3053,6 +3063,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
 				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -7413,6 +7424,8 @@ func (this *StockManagerApiController) ReturnCheckWarehouseOut() {
 	// 查询出库数据
 	list, err := service.GetNewWarehouseOutById(id, orgId, tx)
 	for _, item := range list {
+
+		service.ModifyGoodOutInfoLog(item.GoodId, item.ID, tx)
 		//回退库存
 		service.UpdateaNewGoodWarehouseInfo(item.Count, item.GoodId, item.OrgId, item.WarehouseInfotId, tx)
 
@@ -7541,6 +7554,19 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 			//创建出库流水
 			service.CreateNewStockFlowOne(stockFlow, tx)
 
+			infoLog := models.XtGoodWarehouseInfoLog{
+
+				GoodId:          item.GoodId,
+				WarehouseInfoId: item.ID,
+				RecordDate:      time.Now().Unix(),
+				UserOrgId:       item.OrgId,
+				Status:          1,
+				Ctime:           time.Now().Unix(),
+				Mtime:           time.Now().Unix(),
+			}
+
+			service.CreateGoodWarehouseInfoLog(infoLog, tx)
+
 			//查询该仓库是否有数据
 			stockCount, _ := service.GetNewGoodStockCount(orgId, item.StorehouseId, item.GoodId, tx)
 			if stockCount.ID == 0 {
@@ -7625,6 +7651,7 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 	}
 
 	err := service.UpdateNewWarehouseInfoMap(list, warehousing_info_id, orgId, tx)
+
 	tx.Commit()
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
@@ -8130,7 +8157,7 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
 	//}
 
-	drugList, _ := service.GetAllBaseDrugListTwentyOne(10215)
+	drugList, _ := service.GetAllBaseDrugListTwentyOne(10480)
 
 	for _, item := range drugList {
 		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit

enums/error_code.go

@@ -289,6 +289,8 @@ const ( // ErrorCode
 	ErrorCodeAuthWrong = 600000013
 
 	ErrorCodeFlow = 600000014
+
+	ErrorCodePrescription = 600000015
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -555,6 +557,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorTimeCodeParamWrong: "时间跨度不能超过一个月",
 	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
 	ErrorCodeFlow:           "网络错误,数据异常,审核失败",
+	ErrorCodePrescription:   "请先开处方",
 }
 
 type SGJError struct {

models/good_models.go

@@ -238,85 +238,86 @@ func (GoodInfoSevenThirty) TableName() string {
 }
 
 type XtGoodInformationFourty 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"`
-	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"`
-	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
-	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"`
-	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"`
-	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
-	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"`
-	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	Number                      string  `gorm:"column:number" json:"number" form:"number"`
-	IsWarehouse                 int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
-	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
-	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
-	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
-	TotalCount                  int64   `gorm:"column:total_count" json:"total_count" form:"total_count"`
-	SumOutCount                 int64   `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
-	SumCancelCount              int64   `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
-	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
-	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
-	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
-	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
-	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
-	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
-	TotalCountOne               int64   `gorm:"column:total_count_one" json:"total_count_one" form:"total_count_one"`
-	DepartMent                  string  `gorm:"column:depart_ment" json:"depart_ment" form:"depart_ment"`
-	DepartMentCode              string  `gorm:"column:depart_ment_code" json:"depart_ment_code" form:"depart_ment_code"`
-	TotalCountTwo               int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
-	CodeName                    string  `gorm:"column:code_name" json:"code_name" form:"code_name"`
-	OrgName                     string  `gorm:"column:org_name" json:"org_name" form:"org_name"`
-	GoodTypeName                string  `gorm:"column:good_type_name" json:"good_type_name" form:"good_type_name"`
-	IsShow                      int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
+	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"`
+	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"`
+	Sign                        int64     `gorm:"column:sign" json:"sign" form:"sign"`
+	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"`
+	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"`
+	Total                       float64   `gorm:"column:total" json:"total" form:"total"`
+	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"`
+	RegisterNumber              string    `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ProvincesCode               string    `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	IsUser                      int64     `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string    `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64     `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	BatchRetaiPrice             float64   `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount                    int64     `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount                  int64     `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	TotalCount                  int64     `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	SumOutCount                 int64     `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount              int64     `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	IsPrint                     int64     `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string    `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	ZuobiaoId                   string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b                      string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01                       string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Bbx01                       string    `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	TotalCountOne               int64     `gorm:"column:total_count_one" json:"total_count_one" form:"total_count_one"`
+	DepartMent                  string    `gorm:"column:depart_ment" json:"depart_ment" form:"depart_ment"`
+	DepartMentCode              string    `gorm:"column:depart_ment_code" json:"depart_ment_code" form:"depart_ment_code"`
+	TotalCountTwo               int64     `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
+	CodeName                    string    `gorm:"column:code_name" json:"code_name" form:"code_name"`
+	OrgName                     string    `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	GoodTypeName                string    `gorm:"column:good_type_name" json:"good_type_name" form:"good_type_name"`
+	IsShow                      int64     `gorm:"column:is_show" json:"is_show" form:"is_show"`
+	GoodsType                   GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
 }
 
 func (XtGoodInformationFourty) TableName() string {

models/new_stock_models.go

@@ -492,3 +492,65 @@ type DrugFlowTwenty struct {
 func (DrugFlowTwenty) TableName() string {
 	return "xt_drug_flow"
 }
+
+type XtGoodWarehouseInfoLog struct {
+	ID              int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodId          int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	WarehouseInfoId int64 `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	RecordDate      int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	UserOrgId       int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status          int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime           int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtGoodWarehouseInfoLog) TableName() string {
+	return "xt_good_warehouse_info_log"
+}
+
+type XtGoodWarehouseOutInfoLog struct {
+	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	GoodId             int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	RecordDate         int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	WarehouseOutInfoId int64 `gorm:"column:warehouse_out_info_id" json:"warehouse_out_info_id" form:"warehouse_out_info_id"`
+	Status             int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BatchNumberId      int64 `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+}
+
+func (XtGoodWarehouseOutInfoLog) TableName() string {
+	return "xt_good_warehouse_out_info_log"
+}
+
+type XtDrugWarehouseOutInfoLog struct {
+	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DrugId             int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehouseOutInfoId int64 `gorm:"column:warehouse_out_info_id" json:"warehouse_out_info_id" form:"warehouse_out_info_id"`
+	RecordDate         int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Status             int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BatchNumberId      int64 `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+}
+
+func (XtDrugWarehouseOutInfoLog) TableName() string {
+	return "xt_drug_warehouse_out_info_log"
+}
+
+type XtDrugWarehouseInfoLog struct {
+	ID              int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugId          int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehouseInfoId int64 `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	RecordDate      int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	UserOrgId       int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status          int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime           int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDrugWarehouseInfoLog) TableName() string {
+	return "xt_drug_warehouse_info_log"
+}

models/patient_models.go

@@ -3103,3 +3103,20 @@ func (BtInspection) TableName() string {
 
 	return "xt_inspection"
 }
+
+type XtInspectionOne struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Count        int64
+}

models/stock_models.go

@@ -143,42 +143,42 @@ func (XtWarehouse) TableName() string {
 }
 
 type WarehousingInfo 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"`
-	Warehousing               Warehousing `ForeignKey:WarehousingId json:"warehouse"`
-	WarehousingOrder          string      `gorm:"column:warehousing_order" json:"warehousing_order"`
-	GoodInfo                  GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	Type                      int64       `gorm:"column:type" json:"type"`
-	LicenseNumber             string      `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	WarehouseInfoId           int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	PackingPrice              float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	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"`
-	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber            string      `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	ManafacturerName          string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
-	DealerName                string      `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
-	GoodCode                  string      `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	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"`
+	Warehousing               Warehousing             `ForeignKey:WarehousingId json:"warehouse"`
+	WarehousingOrder          string                  `gorm:"column:warehousing_order" json:"warehousing_order"`
+	GoodInfo                  XtGoodInformationFourty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId"json:"GoodInfo" `
+	Type                      int64                   `gorm:"column:type" json:"type"`
+	LicenseNumber             string                  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64                   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64                   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64                   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	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"`
+	IsCheck                   int64                   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string                  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ManafacturerName          string                  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string                  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	GoodCode                  string                  `gorm:"column:good_code" json:"good_code" form:"good_code"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -262,53 +262,53 @@ func (WarehouseOut) TableName() string {
 }
 
 type WarehouseOutInfo 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"`
-	WarehouseOut            WarehouseOut         `ForeignKey:WarehouseOutId json:"WarehouseOut"`
-	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
-	GoodInfo                GoodInfo             `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	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"`
-	Number                  string               `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string               `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	ProjectId               int64                `gorm:"column:project_id" json:"project_id" form:"project_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"`
-	BuyPrice                float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	StockCount              string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	IsCheck                 int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber          string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	WarehousingInfo         WarehousingInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
-	VmStockFlow             VmStockFlow          `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
-	OverCount               int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	OrderId                 int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	WarehousingInfoNight    WarehousingInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
-	DealerName              string               `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
-	ClassType               string               `gorm:"column:class_type" json:"class_type" form:"class_type"`
+	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"`
+	WarehouseOut            WarehouseOut            `ForeignKey:WarehouseOutId json:"WarehouseOut"`
+	WarehouseOutOrderNumber string                  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	GoodInfo                XtGoodInformationFourty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId"json:"GoodInfo" `
+	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"`
+	Number                  string                  `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string                  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64                   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	ProjectId               int64                   `gorm:"column:project_id" json:"project_id" form:"project_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"`
+	BuyPrice                float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount              string                  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck                 int64                   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber          string                  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	WarehousingInfo         WarehousingInfo         `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
+	VmStockFlow             VmStockFlow             `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
+	OverCount               int64                   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64                   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	WarehousingInfoNight    WarehousingInfoNight    `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
+	DealerName              string                  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	ClassType               string                  `gorm:"column:class_type" json:"class_type" form:"class_type"`
 }
 
 func (WarehouseOutInfo) TableName() string {

service/dialysis_parameter_service.go

@@ -122,12 +122,12 @@ func GetDialysisParameter(orgID int64, schedulDate int64, schedulType int64, par
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, schedulDate).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DialysisSolution", "status=1 and user_org_id = ? and solution_status = 1", orgID)
-	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
+	db = db.Where("xt_schedule.status = 1 AND xt_schedule.user_org_id = ?", orgID)
 	if schedulDate > 0 {
-		db = db.Where("schedule_date = ?", schedulDate)
+		db = db.Where("xt_schedule.schedule_date = ?", schedulDate)
 	}
 	if schedulType > 0 {
-		db = db.Where("schedule_type = ?", schedulType)
+		db = db.Where("xt_schedule.schedule_type = ?", schedulType)
 	}
 	if partitionType > 0 {
 		db = db.Joins("inner join xt_device_number on xt_device_number.id = xt_schedule.bed_id and xt_device_number.zone_id = ? and xt_device_number.status = 1", partitionType)

service/dialysis_service.go

@@ -1613,6 +1613,22 @@ func ModifyHisPrescriptionProject(m *models.HisPrescriptionProject, ids []string
 	return err
 }
 
+func GetHisPrescriptionProjectByIds(ids []string) (project []*models.HisPrescriptionProject, err error) {
+
+	err = readDb.Where("id IN(?) and status=1", ids).Find(&project).Error
+
+	return project, err
+}
+
+func ModfifyProjectListByIds(id int64, exeTime int64, record_date int64, patient_id int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+
+	err := writeDb.Model(&project).Where("team_id = ? and status=1 and execution_state = 1 and record_date = ? and patient_id=?", id, record_date, patient_id).Updates(map[string]interface{}{"execution_time": exeTime}).Error
+
+	return project, err
+}
+
 func FindHisProjectById(orgID int64, id int64) (advice models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return
@@ -2167,6 +2183,13 @@ func GetTodayInforMation(orgid int64, record_date int64) (list []*NewDeviceInfor
 	return list, err
 }
 
+func GetDialysisSolutionByDate(org_id int64) (solution []*models.DialysisSolution, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and solution_status = 1 and status=1", org_id).Find(&solution).Error
+
+	return solution, err
+}
+
 func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
 
 	config := models.FiledConfig{}

service/dialysis_solution_service.go

@@ -601,6 +601,7 @@ func GetHisDialysisGoodCountTwo(orgID int64, schedule_type int64, partition_id [
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("DialysisSolution", "status=1 and user_org_id =? and solution_status =1", orgID).
 		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {

service/drug_stock_service.go

@@ -194,7 +194,7 @@ func GetDrugCancelExportList(orderid []string, orgid int64) (info []*models.Drug
 	return info, err
 }
 
-func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64, storehouse_id int64, drug_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 	if startime > 0 {
@@ -209,6 +209,9 @@ func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64, store
 	if storehouse_id > 0 {
 		db = db.Where("storehouse_id =?", storehouse_id)
 	}
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
 	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number,x.dealer,x.manufacturer").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
 
 	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error
@@ -264,7 +267,7 @@ func GetDrugOutOrderPrintList(startime int64, endtime int64, orgid int64) (list
 	return list, err
 }
 
-func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64, storehouse_id int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
+func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64, storehouse_id int64, drug_id int64, order_way int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_out_info").Where("status = 1 and is_check=1")
 	if startime > 0 {
@@ -279,6 +282,15 @@ func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64, st
 	if storehouse_id > 0 {
 		db = db.Where("storehouse_id=?", storehouse_id)
 	}
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if order_way == 1 {
+		db = db.Where("is_sys !=1")
+	}
+	if order_way == 2 {
+		db = db.Where("is_sys = 1")
+	}
 	err = db.Preload("XtDrugWarehouseInfo", "status=1 and org_id =?", orgid).Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
 	return list, err
 }

service/gobal_config_service.go

@@ -317,7 +317,7 @@ func GetExportHisOrderListBySetlTIME(user_org_id int64, start_time string, end_t
 	return
 }
 
-func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
+func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64, drug_id int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -341,6 +341,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
 
 	if len(keyword) > 0 {
 		db = db.Joins("left join sgj_xt.xt_drug_warehouse as o on o.id = x.warehousing_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater")
@@ -392,7 +395,7 @@ func GetDrugReturnOrder(startime int64, endtime int64, orgid int64, orderType in
 	return returninfo, total, err
 }
 
-func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (outinfo []*models.BloodDrugWarehouseOutInfo, total int64, err error) {
+func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64, drug_id int64, order_way int64) (outinfo []*models.BloodDrugWarehouseOutInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -419,6 +422,16 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
+	if order_way == 1 {
+		db = db.Where("x.is_sys!=1")
+	}
+	if order_way == 2 {
+		db = db.Where("x.is_sys=1")
+	}
+
 	if len(keyword) > 0 {
 		db = db.Joins("left join sgj_xt.xt_drug_warehouse_out as o on o.id = x.warehouse_out_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("x.id")
 		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ?  or r.user_name like ?", likeKey, likeKey, likeKey)
@@ -434,7 +447,7 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	return outinfo, total, err
 }
 
-func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, storehouse_id int64) (info []*models.BloodDrugCancelStockInfo, err error) {
+func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, storehouse_id int64, drug_id int64) (info []*models.BloodDrugCancelStockInfo, err error) {
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Table("xt_drug_cancel_stock_info as x").Where("x.status =1")
 	dbOne := XTReadDB().Table("xt_base_drug as s").Where("s.status =1")
@@ -459,6 +472,10 @@ func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderTy
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
+
 	if manufacturerId > 0 {
 		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	} else {
@@ -468,7 +485,7 @@ func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderTy
 	return info, err
 }
 
-func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
+func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64, drug_id int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -491,6 +508,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
 	if len(keyword) > 0 {
 		db = db.Joins("left join sgj_xt.xt_drug_cancel_stock as o on o.id = x.cancel_stock_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("o.id")
 

service/inspection_service.go

@@ -368,6 +368,15 @@ func GetInspectionGroup(patient_id int64, org_id int64) (inspection []*models.Ne
 	return inspection, err
 }
 
+func GetInspectionGroupOne(org_id int64) (inspection []*models.XtInspectionOne, err error) {
+
+	//XTReadDB().Model(&inspection).Where("(org_id = ? or org_id = 0) and status=1", patient_id, org_id).Find()
+
+	err = readDb.Raw("SELECT r.project_name,r.project_id,x.inspect_date FROM xt_inspection as x LEFT JOIN xt_inspection_reference as r on r.project_id = x.project_id WHERE (x.org_id = ? or x.org_id = 0) and x.project_id >0 GROUP BY r.project_id ", org_id).Scan(&inspection).Error
+
+	return inspection, err
+}
+
 func GetLastInspectionProject(patient_id int64, org_id int64, project_id int64) (models.XtInspection, error) {
 
 	inspection := models.XtInspection{}

service/mobile_dialysis_service.go

@@ -130,6 +130,7 @@ type MDialysisScheduleVM struct {
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
+	DialysisSolution         *models.DialysisSolution          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (MDialysisScheduleVM) TableName() string {

service/new_warehouse_service.go

@@ -602,6 +602,18 @@ func UpdateNewDrugStockCount(drug_id int64, org_id int64, storehouse_id int64, f
 	return err
 }
 
+func UpdateDrugWarehouseOutInfoLog(id int64, drug_id int64, tx *gorm.DB) (models.XtDrugWarehouseOutInfoLog, error) {
+
+	outInfoLog := models.XtDrugWarehouseOutInfoLog{}
+
+	err := tx.Model(&outInfoLog).Where("warehouse_out_info_id = ? and drug_id = ? and status=1", id, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return outInfoLog, err
+	}
+	return outInfoLog, err
+}
+
 func AddDrugCount(drug_id int64, org_id int64, storehouse_id int64, out_count int64) error {
 
 	ut := XTWriteDB().Begin()
@@ -4496,19 +4508,21 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
 		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			fmt.Println("hahhahahahahhaah")
 			var stockMax int64
 			var stockMin int64
 			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
 
 			ChangeNewMaxNumber(lastWarehouse.ID, stockMax, tx)
+
 			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
 
 		}
 	}
 
 	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
-
+		fmt.Println("ooowowowowowowowowowo")
 		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
 		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
 
@@ -4533,8 +4547,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 	}
 
-	//fmt.Println("stock_number", stock_number)
-	//fmt.Println("deliver_number=============", deliver_number)
+	fmt.Println("stock_number", stock_number)
+	fmt.Println("deliver_number=============", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -4544,6 +4558,9 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
+		fmt.Println("max_Number=====================", maxNumber)
+		fmt.Println("minNumber=====================", minNumber)
+
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -4556,15 +4573,18 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
 
+			fmt.Println("金1")
+
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
 
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-
+			fmt.Println("jin2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
-		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
 
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			fmt.Println("jin3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -4577,11 +4597,20 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		warehouse.Mtime = time.Now().Unix()
 
-		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
-		//fmt.Println("howowowoowow", minNumber)
+		fmt.Println("hahhahahah", warehouse.StockMinNumber)
+		fmt.Println("howowowoowow", minNumber)
 		if warehouse.StockMinNumber < minNumber {
 
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				//改动的地方
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
+
+			if warehouse.MaxUnit == warehouse.MinUnit {
+				//改动的地方
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - minNumber
+			}
+
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}

service/patient_service.go

@@ -83,11 +83,11 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	}
 	if lapseto != 2 && lapseto != 3 {
-		if orgID != 10579 && orgID != 10600 && orgID != 10587 {
+		if orgID != 10579 && orgID != 10600 && orgID != 10587 && orgID != 10745 {
 			err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious,p.patient_type").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
-		if orgID == 10579 || orgID == 10600 {
+		if orgID == 10579 || orgID == 10600 || orgID == 10745 {
 			err = db.Order("p.dialysis_no asc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious,p.patient_type").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
@@ -1921,6 +1921,15 @@ func UpdatePatientDialysisPrscription(id int64, dewater_amount float64) (models.
 	return prescription, err
 }
 
+func UpdatePatientDialysisPrscriptionOne(id int64, dewater_amount float64) (models.XtDialysisPrescription, error) {
+
+	prescription := models.XtDialysisPrescription{}
+
+	err := XTWriteDB().Model(&prescription).Where("id = ? and status =1", id).Update(map[string]interface{}{"target_ultrafiltration": dewater_amount}).Error
+
+	return prescription, err
+}
+
 func FindLastDryWeightAdjust(orgID int64, id int64) (weight models.SgjPatientDryweight, err error) {
 	err = readDb.Model(&models.SgjPatientDryweight{}).Where("user_org_id=? and patient_id=? and status=1", orgID, id).Order("id desc").First(&weight).Error
 	return
@@ -4602,7 +4611,7 @@ func GetAutoAssessmentBefor(patient_id int64, start_time int64, end_time int64,
 	if org_id > 0 {
 		db = db.Where("user_org_id = ?", org_id)
 	}
-	err = db.Find(&berfor).Error
+	err = db.Order("assessment_date asc").Find(&berfor).Error
 	return berfor, err
 }
 
@@ -4632,7 +4641,7 @@ func GetLastAfterWeight(patient_id int64, assessment_date int64, user_org_id int
 
 	afterDislysis := models.XtAssessmentAfterDislysis{}
 
-	err := XTReadDB().Where("patient_id = ? and assessment_date <? and user_org_id =? and status=1", patient_id, assessment_date, user_org_id).Order("assessment_date asc").Last(&afterDislysis).Error
+	err := XTReadDB().Where("patient_id = ? and assessment_date = ? and user_org_id =? and status=1", patient_id, assessment_date, user_org_id).Order("assessment_date asc").Last(&afterDislysis).Error
 
 	return afterDislysis, err
 }
@@ -4684,7 +4693,7 @@ func GetAutoPatientDryWeight(patient_id int64, start_time int64, end_time int64,
 func GetPatientLastDryWeightObj(patient_id int64, start_time int64, end_time int64, org_id int64) (models.SgjPatientDryweight, error) {
 
 	dryweight := models.SgjPatientDryweight{}
-	err := XTReadDB().Where("patient_id =? and user_org_id = ? and status=1", patient_id, org_id).Order("id asc").Last(&dryweight).Error
+	err := XTReadDB().Where("patient_id =? and user_org_id = ? and status=1", patient_id, org_id, start_time, end_time).Order("id asc").Last(&dryweight).Error
 	return dryweight, err
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -112,6 +112,7 @@ type DialysisOrderVM struct {
 	PunctureNeedle     string          `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	BloodDrawing       int64           `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
 	DialysisStrainer   string          `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	ChangeNurse        int64           `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -311,6 +312,7 @@ type AssessmentBeforeDislysisVM struct {
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
 	PunctureNeedleDirection        string  `gorm:"column:puncture_needle_direction" json:"puncture_needle_direction" form:"puncture_needle_direction"`
+	BeforSymptoms                  string  `gorm:"column:befor_symptoms" json:"befor_symptoms" form:"befor_symptoms"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -234,6 +234,19 @@ func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDial
 //	return
 //}
 
+func GetDialysisOrderCountNewTen(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
+}
+
+func GetDialysisOrderCountTwenty(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
+}
+
 func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
 	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
@@ -253,6 +266,19 @@ func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoM
 	return autoMatic, err
 }
 
+func GetOutStockTotalCountThree(startime int64, endtime int64, orgid int64, good_id int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	db := p_service.XTReadDB()
+
+	if good_id > 0 {
+		err = db.Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and x.`status` = 1 and x.good_id=?)  as b GROUP BY good_id", orgid, startime, endtime, good_id).Scan(&autoMatic).Error
+	} else {
+		err = db.Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and x.`status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+	}
+
+	return autoMatic, err
+}
+
 func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
 
 	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
@@ -266,11 +292,16 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 	return goodInfo, err
 }
 
-func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64, storehouse_id int64) (info []*models.VmWarehousingInfo, err error) {
+func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64, storehouse_id int64, good_id int64) (info []*models.VmWarehousingInfo, err error) {
 	//offset := (page - 1) * limit
 	db := p_service.XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
+
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -309,7 +340,7 @@ func GetWarehouseOutInfoGoodDetailPrintList(orgid int64, startime int64, endtime
 
 }
 
-func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (out []*models.SgjWarehouseOutInfo, err error) {
+func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64, good_id int64, order_way int64) (out []*models.SgjWarehouseOutInfo, err error) {
 
 	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
@@ -317,6 +348,15 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	tableOne := p_service.XTReadDB().Table("xt_warehouse_info as p").Where("p.status = 1")
 	fmt.Println(table)
 	fmt.Println("tableOne", tableOne)
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+	if order_way == 1 {
+		db = db.Where("x.is_sys!=1")
+	}
+	if order_way == 2 {
+		db = db.Where("x.is_sys==1")
+	}
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}

service/schedule_service.go

@@ -235,6 +235,15 @@ func GetDayScheduleByBedid(orgID, start, bed_id int64, schedule_type int64) (sch
 	return
 }
 
+func GetDialysisPrescriptionByRecord(orgID int64, patient_id int64, record_date int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+
+	err = readDb.Where("user_org_id = ? and patient_id = ? and record_date = ? and status=1", orgID, patient_id, record_date).Find(&prescription).Error
+
+	return prescription, err
+}
+
 func GetDayScheduleByOrder(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
 	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
 	return

service/self_drug_service.go

@@ -138,6 +138,13 @@ func GetBaseDrugMedical(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
+func GetLastDrugWarehouseInfoList(drug_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status=1 and (stock_max_number > 0 or stock_min_number>0) and is_check =1", drug_id).Find(&info).Error
+
+	return info, err
+}
+
 func GetNewBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error

service/sign_service.go

@@ -2385,3 +2385,18 @@ func CreteStockCheckQuery(query models.XtStockCheckQuery) error {
 
 	return err
 }
+
+func GetDoctorAdviceListByUserOrgId(user_org_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id  = ? and advice_date = ? and status=1", user_org_id, advice_date).Find(&advice).Error
+
+	return advice, err
+}
+
+func GetSelfDrugWarehouseOutInfo(patient_id int64, drug_id int64, advice_Date int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+
+	outInfo := models.XtSelfDrugWarehouseOutInfo{}
+	err := XTReadDB().Where("patient_id = ? and drug_id = ? and sys_record_time = ? and status=1", patient_id, drug_id, advice_Date).Find(&outInfo).Error
+
+	return outInfo, err
+}

service/statistis_qc_service.go

@@ -718,8 +718,8 @@ func GetDialysisCompletionRate(org_id int64, start_time int64, end_time int64) (
         SELECT
             CASE
                 WHEN ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) <= 15 THEN '达到透析处方时间'
-                WHEN TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15 THEN '超出处方时间'
-                ELSE '未达到处方时间'
+                WHEN TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15 THEN '未达到处方时间'
+                ELSE '超出处方时间'
             END AS dialysis_status,
             COUNT(*) AS count
         FROM
@@ -845,13 +845,13 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	   JOIN
 	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
 	   WHERE
-	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15
 	`
 		readDb.Table("xt_dialysis_order o").
 			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
 			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
 			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
-			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0", org_id, start_time, end_time).Count(&total)
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15", org_id, start_time, end_time).Count(&total)
 
 	} else if mode == 3 {
 		query = `
@@ -874,13 +874,13 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	   JOIN
 	       xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?
 	   WHERE
-	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15
+	       o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < -15
 	`
 		readDb.Table("xt_dialysis_order o").
 			Joins("JOIN xt_patients pp ON o.patient_id = pp.id AND pp.user_org_id = ?", org_id).
 			Joins("JOIN xt_dialysis_prescription p ON o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND p.user_org_id = ?", org_id).
 			Joins("JOIN xt_assessment_after_dislysis a ON o.dialysis_date = a.assessment_date AND o.patient_id = a.patient_id AND a.user_org_id = ?", org_id).
-			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) > 15", org_id, start_time, end_time).Count(&total)
+			Where("o.stage = 2 AND o.user_org_id = ? AND o.dialysis_date >= ? AND o.dialysis_date <= ? and TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0)) < 0", org_id, start_time, end_time).Count(&total)
 
 	}
 

service/stock_service.go

@@ -933,6 +933,15 @@ func CreateNewDrugFlowOne(flow models.DrugFlow, tx *gorm.DB) error {
 	}
 	return err
 }
+func CreateDrugOutInfoLog(log models.XtDrugWarehouseOutInfoLog, tx *gorm.DB) error {
+
+	err := tx.Create(&log).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
 
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64) (models.DrugAutomaticReduceDetail, error) {
 	detail := models.DrugAutomaticReduceDetail{}
@@ -982,6 +991,16 @@ func CreateNewDrugFlowTwo(flow *models.DrugFlow, tx *gorm.DB) error {
 	return err
 }
 
+func CreateInfoLog(log models.XtDrugWarehouseInfoLog, tx *gorm.DB) error {
+	err := tx.Create(&log).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
 
@@ -3427,10 +3446,15 @@ type StockDetailModel struct {
 	Types            int64   `gorm:"types" json:"types"`
 }
 
-func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.WarehousingInfo, total int64, err error) {
+func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64) (list []*models.WarehousingInfo, total int64, err error) {
 
 	db := readDb.Model(&models.WarehousingInfo{})
 	db = db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1 AND xt_warehouse_info.is_check = 1", orgId)
+
+	if good_id > 0 {
+
+		db = db.Where("xt_warehouse_info.good_id = ?", good_id)
+	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
 		//db = db.Joins("join xt_warehouse on xt_warehouse.id = xt_warehouse_info.warehousing_id AND ")
@@ -3463,9 +3487,12 @@ func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64
 	return
 }
 
-func GetStockInDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (err error, totalPrice float64) {
+func GetStockInDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64) (err error, totalPrice float64) {
 	db := readDb.Model(&models.WarehousingInfo{})
 	db = db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId)
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
 		//db = db.Joins("join xt_warehouse on xt_warehouse.id = xt_warehouse_info.warehousing_id AND ")
@@ -3504,7 +3531,7 @@ func FloatRound(f float64, n int) float64 {
 	return res
 }
 
-func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.WarehouseOutInfo, total int64, err error) {
+func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64, order_way int64) (list []*models.WarehouseOutInfo, total int64, err error) {
 
 	if orgId == 9671 {
 		db := readDb.Model(&models.WarehouseOutInfo{})
@@ -3543,7 +3570,15 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 	} else {
 		db := readDb.Model(&models.WarehouseOutInfo{})
 		db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.count <> 0 ", orgId)
-
+		if good_id > 0 {
+			db = db.Where("good_id = ?", good_id)
+		}
+		if order_way == 1 {
+			db = db.Where("xt_warehouse_out_info.is_sys =0")
+		}
+		if order_way == 2 {
+			db = db.Where("xt_warehouse_out_info.is_sys !=0")
+		}
 		if len(keywords) > 0 {
 			likeKey := "%" + keywords + "%"
 			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
@@ -3578,7 +3613,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 
 }
 
-func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (err error, totalPrice float64) {
+func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64, order_way int64) (err error, totalPrice float64) {
 	db := readDb.Model(&models.WarehouseOutInfo{})
 	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1  AND xt_warehouse_out_info.count > 0", orgId)
 
@@ -3593,6 +3628,18 @@ func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keyword
 		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id and   xt_warehouse_out.org_id = xt_warehouse_out_info.org_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
 	}
 
+	if good_id > 0 {
+		db = db.Where("xt_warehouse_out_info.good_id = ?", good_id)
+	}
+
+	if order_way == 1 {
+		db = db.Where("xt_warehouse_out_info.is_sys = ?", 0)
+	}
+
+	if order_way == 2 {
+		db = db.Where("xt_warehouse_out_info.is_sys != ?", 0)
+	}
+
 	if manufacturer > 0 {
 		db = db.Joins("join xt_warehouse_out as wa on wa.id = xt_warehouse_out_info.warehouse_out_id AND wa.manufacturer =?", manufacturer)
 	}
@@ -3651,7 +3698,7 @@ func FindSalesReturnDetailList(orgId int64, page int64, limit int64, startTime i
 	return
 }
 
-func FindeCancelGroup(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.CancelStockInfo, err error) {
+func FindeCancelGroup(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64) (list []*models.CancelStockInfo, err error) {
 	db := readDb.Model(&models.CancelStockInfo{})
 	db = db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId)
 	if len(keywords) > 0 {
@@ -3676,6 +3723,9 @@ func FindeCancelGroup(orgId int64, startTime int64, endTime int64, keywords stri
 	if storehouse_id > 0 {
 		db = db.Where("xt_cancel_stock_info.storehouse_id = ?", order_type)
 	}
+	if good_id > 0 {
+		db = db.Where("xt_cancel_stock_info.good_id = ?", good_id)
+	}
 
 	db = db.Preload("CancelStock", "status = 1 AND org_id = ?", orgId)
 	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
@@ -3684,7 +3734,7 @@ func FindeCancelGroup(orgId int64, startTime int64, endTime int64, keywords stri
 	return
 }
 
-func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.CancelStockInfo, total int64, err error) {
+func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64, good_id int64) (list []*models.CancelStockInfo, total int64, err error) {
 	db := readDb.Model(&models.CancelStockInfo{})
 	db = db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId)
 	if len(keywords) > 0 {
@@ -3708,6 +3758,9 @@ func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64,
 	if storehouse_id > 0 {
 		db = db.Where("xt_cancel_stock_info.storehouse_id = ?", storehouse_id)
 	}
+	if good_id > 0 {
+		db = db.Where("xt_cancel_stock_info.good_id =?", good_id)
+	}
 
 	db = db.Preload("CancelStock", "status = 1 AND org_id = ?", orgId)
 	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
@@ -5925,6 +5978,26 @@ func CreateNewStockFlowOne(flow models.VmStockFlow, tx *gorm.DB) error {
 	return err
 }
 
+func CreateOutInfoLog(log models.XtGoodWarehouseOutInfoLog, tx *gorm.DB) error {
+
+	err := tx.Create(&log).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func CreateGoodWarehouseInfoLog(log models.XtGoodWarehouseInfoLog, tx *gorm.DB) error {
+
+	err := tx.Create(&log).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func CreateStockFlowSix(flow *models.VmStockFlow) error {
 
 	err := XTWriteDB().Create(&flow).Error
@@ -8510,6 +8583,20 @@ func UpdateaGoodWarehouseInfo(count int64, good_id int64, orgid int64, warehouse
 
 }
 
+func ModifyGoodOutInfoLog(good_id int64, id int64, tx *gorm.DB) (models.XtGoodWarehouseOutInfoLog, error) {
+
+	outInfoLog := models.XtGoodWarehouseOutInfoLog{}
+
+	err := tx.Model(&outInfoLog).Where("good_id = ? and warehouse_out_info_id = ?", good_id, id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return outInfoLog, err
+	}
+	return outInfoLog, err
+
+}
+
 func UpdateaNewGoodWarehouseInfo(count int64, good_id int64, orgid int64, warehouse_info_id int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.WarehousingInfo{}).Where("good_id = ?  and org_id = ? and status = 1 and id = ?", good_id, orgid, warehouse_info_id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
@@ -8569,6 +8656,7 @@ func ModifyNewGoodWarehouseOut(id int64, tx *gorm.DB) error {
 		tx.Rollback()
 		return err
 	}
+
 	return err
 }
 
@@ -8926,6 +9014,12 @@ func ReturnNewCheckWarehouseingInfo(id int64, orgid int64, tx *gorm.DB) error {
 		tx.Rollback()
 		return err
 	}
+
+	err = tx.Model(models.XtDrugWarehouseInfoLog{}).Where("warehouse_info_id = ? and status=1", id).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	return err
 }
 
@@ -9936,6 +10030,12 @@ func GetSettleOpenConfigByOrgId(user_org_id int64) (models.HisSettleStockConfig,
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
 	return config, nil
 }
+func GetGoodWareHouseOutInfoByGood(good_id int64, sys_record_time int64, user_org_id int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id= ? and sys_record_time = ? and org_id = ? and status=1", good_id, sys_record_time, user_org_id).Find(&info).Error
+
+	return info, err
+}
 
 func GetGoodInformationByGoodIdOne(good_id int64) (models.GoodInformationFourty, error) {
 
@@ -9944,6 +10044,13 @@ func GetGoodInformationByGoodIdOne(good_id int64) (models.GoodInformationFourty,
 	return info, err
 }
 
+func GetGoodWarehouseInfoByGoodList(good_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and status =1 and stock_count>0 and is_check = 1", good_id).Find(&info).Error
+
+	return info, err
+}
+
 func GetAllWarehouseInfo(good_id int64, user_org_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = XTReadDB().Where("good_id = ? and user_org_id =? and status=1 and is_check =1", good_id, user_org_id).Find(&info).Error
@@ -10441,6 +10548,12 @@ func UpdateNewWarehouseInfoMap(list []*models.WarehousingInfo, warehousing_info_
 			return err
 		}
 
+		err = tx.Model(models.XtGoodWarehouseInfoLog{}).Where("warehouse_info_id = ? and status=1", item.ID).Update(map[string]interface{}{"status": 0}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
 	}
 	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", warehousing_info_id).Update(map[string]interface{}{"is_check": 2}).Error
 	if err != nil {

service/warhouse_service.go

@@ -10910,6 +10910,20 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		//创建出库流水
 		CreateNewStockFlowOne(stockFlow, tx)
 
+		outInfoLog := models.XtGoodWarehouseOutInfoLog{
+
+			UserOrgId:          goods.OrgId,
+			GoodId:             goods.GoodId,
+			RecordDate:         record_time,
+			WarehouseOutInfoId: goods.ID,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			BatchNumberId:      warehouse.ID,
+		}
+
+		CreateOutInfoLog(outInfoLog, tx)
+
 		//添加入库ID
 		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
 
@@ -10975,6 +10989,19 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		//创建出库流水
 		CreateNewStockFlowOne(stockFlow, tx)
 
+		outInfoLog := models.XtGoodWarehouseOutInfoLog{
+			UserOrgId:          goods.OrgId,
+			GoodId:             goods.GoodId,
+			RecordDate:         record_time,
+			WarehouseOutInfoId: goods.ID,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			BatchNumberId:      warehouse.ID,
+		}
+
+		CreateOutInfoLog(outInfoLog, tx)
+
 		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
 
 		//更新出库数量
@@ -11205,7 +11232,20 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			drugflow.Price = advice.Price
 		}
 
-		CreateDrugFlowOne(drugflow)
+		CreateNewDrugFlowOne(drugflow, tx)
+
+		outInfoLog := models.XtDrugWarehouseOutInfoLog{
+			UserOrgId:          advice.OrgId,
+			DrugId:             advice.DrugId,
+			WarehouseOutInfoId: drugWareInfo.ID,
+			RecordDate:         advice.SysRecordTime,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			BatchNumberId:      warehouse.ID,
+		}
+
+		CreateDrugOutInfoLog(outInfoLog, tx)
 
 		//更新出库id
 		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
@@ -11275,6 +11315,18 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)
+
+		outInfoLog := models.XtDrugWarehouseOutInfoLog{
+			UserOrgId:          advice.OrgId,
+			DrugId:             advice.DrugId,
+			WarehouseOutInfoId: drugWareInfo.ID,
+			RecordDate:         advice.SysRecordTime,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			BatchNumberId:      warehouse.ID,
+		}
+		CreateDrugOutInfoLog(outInfoLog, tx)
 		//更新出库id
 		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
 		// 出库完成后，要将该批次库存清零
@@ -11288,3 +11340,225 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 
 	return
 }
+
+// 药品手动出库 递归方式
+func AutoNewSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, warehouseout *models.XtSelfDrugWarehouseOut, drup *models.BaseDrugLib, advice *models.XtSelfDrugWarehouseOutInfo, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var drug_price float64
+	if advice.CountUnit == drup.MaxUnit {
+		deliver_number = prescribingNumber * drup.MinNumber
+
+	} else {
+		deliver_number = prescribingNumber
+
+	}
+	if advice.CountUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+	fmt.Println(drug_price)
+
+	if advice.CountUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
+	}
+
+	if advice.CountUnit != drup.MaxUnit || advice.CountUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	lastWarehouse, _ := FindSelfLastDrugWarehousingInfoByID(advice.DrugId, advice.PatientId, tx)
+
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeSelfMaxNumber(lastWarehouse.ID, stockMax, tx)
+			UpdateSelfMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeSelfMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, err := FindSelfLastDrugWarehousingInfoByID(advice.DrugId, advice.PatientId, tx)
+
+	var maxNumber int64 = 0
+	var minNumber int64 = 0
+
+	maxNumber = deliver_number / drup.MinNumber
+	minNumber = deliver_number % drup.MinNumber
+
+	if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+		minNumber = maxNumber
+	}
+
+	if drup.MaxUnit != drup.MinUnit {
+		if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+			return errors.New("库存数量不足")
+		}
+	}
+
+	if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+	}
+
+	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	}
+	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	}
+
+	if warehouse.StockMaxNumber < 0 {
+		warehouse.StockMaxNumber = 0
+	}
+	if warehouse.StockMinNumber < 0 {
+		warehouse.StockMinNumber = 0
+	}
+
+	warehouse.Mtime = time.Now().Unix()
+
+	if warehouse.StockMinNumber < minNumber {
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		if warehouse.MaxUnit != warehouse.MinUnit {
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		}
+		if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		}
+	} else {
+
+		if minNumber > 0 {
+			if (warehouse.StockMinNumber - minNumber) >= 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+		}
+
+		if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+
+			if warehouse.StockMinNumber > 0 {
+				if warehouse.StockMinNumber-deliver_number >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
+			}
+
+		}
+
+	}
+
+	if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+		if (warehouse.StockMinNumber - deliver_number) >= 0 {
+			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		}
+
+	}
+
+	if drup.MaxUnit != drup.MinUnit {
+		if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+			return errors.New("库存数量不足")
+		}
+	}
+	if warehouse.StockMinNumber <= 0 {
+		warehouse.StockMinNumber = 0
+	}
+
+	errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
+
+	if errThree != nil {
+		return errors.New("扣减库存失败")
+	}
+
+	//查询该药品剩余库存
+	infolist, _ := FindSelfDrugWarehouseInfoFlushCount(advice.DrugId, advice.OrgId, tx)
+	var over_count int64
+	for _, its := range infolist {
+		if its.MaxUnit == drup.MaxUnit {
+			its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+		}
+		over_count += its.StockMaxNumber + its.StockMinNumber
+	}
+
+	//更新出库id
+	//查询今日该药品该患者是否有出库数据
+	lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
+
+	if lastDrugOutInfo.ID == 0 {
+		advice.WarehouseInfoId = lastWarehouse.ID
+		AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+	}
+	if lastDrugOutInfo.ID > 0 {
+		advice.WarehouseInfoId = lastWarehouse.ID
+		//删除在新增
+		UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+
+		AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+
+	}
+
+	drugWareInfo, _ := GetSelfLastWarehouseOutInfoById(advice.DrugId, tx)
+	drugflow := models.XtSelfDrugFlow{
+		WarehouseOutId:          warehouseout.ID,
+		WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+		DrugId:                  advice.DrugId,
+		Number:                  warehouse.Number,
+		ProductDate:             advice.ProductDate,
+		ExpireDate:              advice.ExpiryDate,
+		Count:                   deliver_number,
+		Price:                   warehouse.RetailPrice,
+		Status:                  1,
+		Ctime:                   advice.SysRecordTime,
+		Mtime:                   time.Now().Unix(),
+		UserOrgId:               advice.OrgId,
+		Manufacturer:            advice.Manufacturer,
+		Dealer:                  advice.Dealer,
+		BatchNumber:             warehouse.BatchNumber,
+		MaxUnit:                 drup.MinUnit,
+		ConsumableType:          3,
+		IsEdit:                  1,
+		Creator:                 0,
+		IsSys:                   0,
+		WarehouseOutDetailId:    drugWareInfo.ID,
+		AdviceId:                advice.ID,
+		SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+		StorehouseId:            advice.StorehouseId,
+		AdminUserId:             advice.AdminUserId,
+		LastPrice:               warehouse.Price,
+		StockCount:              advice.StockCount,
+		WarehousingDetailId:     warehouse.ID,
+		OverCount:               over_count,
+		RetailPrice:             drug_price, //手动出库出库价格
+		WarehousingId:           warehouse.ID,
+		SystemTime:              advice.SysRecordTime,
+		PatientId:               advice.PatientId,
+		Remark:                  advice.Remark,
+		OperateTime:             time.Now().Unix(),
+	}
+	if warehouse.RetailPrice == 0 {
+		drugflow.Price = advice.Price
+	}
+
+	CreateSelfDrugFlowOne(drugflow, tx)
+
+	//出库数量相加
+	AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
+
+	return
+}