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

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 5386
+		userAdmin.Id = 2301
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 5386 //4，809
+		userAdmin.Id = 2301 //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 = 10727 //机构id
+		subscibe.OrgId = 10402 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10727 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18470 //4
+		adminUserInfo.CurrentOrgId = 10402 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 5386
+		userAdmin.Id = 2301
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 5386 //4，809
+		userAdmin.Id = 2301 //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 = 10727 //机构id小英9675或4
+		subscibe.OrgId = 10402 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10727 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18470 //4
+		adminUserInfo.CurrentOrgId = 10402 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_api_controller.go

@@ -3390,7 +3390,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3892,6 +3892,26 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
 
+										if drugMedical.SumCount == 0 {
+											tx.Rollback()
+											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+											return
+
+										}
+									}
+									if s.ID > 0 {
+										//查询改药品是否已经停用
+										base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+
+										if base.ID > 0 {
+											tx.Rollback()
+											c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+											return
+
+										}
+
+										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+
 										if drugMedical.SumCount == 0 {
 											tx.Rollback()
 											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
@@ -4024,6 +4044,28 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 										}
 
+										if p.ID > 0 {
+											//查询该耗材是否停用
+											goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+											//表示该耗材已经停用，不能保存
+											if goodInfoSeven.ID == 0 {
+												tx.Rollback()
+												goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+
+												return
+
+											}
+
+											goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+											if goodInfoOne.SumCount == 0 {
+												tx.Rollback()
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+
+												return
+											}
+										}
+
 									}
 								}
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -930,6 +930,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 
+				if adminUserInfo.Org.Id == 10702 {
+					evaluation.PreDialysisDrugs = "无"
+				}
+
 				evaluation.Remark = lastPredialysisEvaluation.Remark
 				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
 					evaluation.Remark = ""
@@ -988,6 +992,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
 		}
 
+		if adminUserInfo.Org.Id == 10206 {
+			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
+		}
+
 		err := service.UpadatePredialysisEvaluation(&evaluation)
 
 		//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3013,70 +3013,78 @@ 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 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
-		if evaluation.SystolicBloodPressure == 0 {
-			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
 
-			if adminUserInfo.Org.Id == 10693 {
-				SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
-				evaluation.SystolicBloodPressure = SystolicBloodPressureOne
-			}
+		if adminUserInfo.Org.Id != 10702 {
+			if evaluation.SystolicBloodPressure == 0 {
+				evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
 
-			pre := models.PredialysisEvaluation{
-				SystolicBloodPressure: evaluation.SystolicBloodPressure,
-			}
-			fmt.Println("prew", pre)
-			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+				if adminUserInfo.Org.Id == 10693 {
+					SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+					evaluation.SystolicBloodPressure = SystolicBloodPressureOne
+				}
 
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
+				pre := models.PredialysisEvaluation{
+					SystolicBloodPressure: evaluation.SystolicBloodPressure,
+				}
+				fmt.Println("prew", pre)
+				getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+
+				redis := service.RedisClient()
+				redis.Set(key, "", time.Second)
+				redis.Set(keyOne, "", time.Second)
+				defer redis.Close()
+				fmt.Println(getNurseErr)
+			}
 		}
 
-		if evaluation.DiastolicBloodPressure == 0 {
-			evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
+		if adminUserInfo.Org.Id != 10702 {
+			if evaluation.DiastolicBloodPressure == 0 {
+				evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
 
-			if adminUserInfo.Org.Id == 10693 {
-				DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
-				evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
-			}
-			pres := models.PredialysisEvaluation{
-				DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
-			}
+				if adminUserInfo.Org.Id == 10693 {
+					DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+					evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
+				}
+				pres := models.PredialysisEvaluation{
+					DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
+				}
 
-			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+				getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
+				redis := service.RedisClient()
+				redis.Set(key, "", time.Second)
 
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+				redis.Set(keyOne, "", time.Second)
+				defer redis.Close()
+				fmt.Println(getNurseErr)
+			}
 		}
-		if evaluation.PulseFrequency == 0 {
-			evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
 
-			if adminUserInfo.Org.Id == 10693 {
-				pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
-				evaluation.PulseFrequency = pulseFrequency
-			}
-			press := models.PredialysisEvaluation{
-				PulseFrequency: evaluation.PulseFrequency,
-			}
-			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		if adminUserInfo.Org.Id != 10702 {
+			if evaluation.PulseFrequency == 0 {
+				evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
 
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
+				if adminUserInfo.Org.Id == 10693 {
+					pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+					evaluation.PulseFrequency = pulseFrequency
+				}
+				press := models.PredialysisEvaluation{
+					PulseFrequency: evaluation.PulseFrequency,
+				}
+				getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+				redis := service.RedisClient()
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+				redis.Set(keyOne, "", time.Second)
+				defer redis.Close()
+				fmt.Println(getNurseErr)
+			}
 		}
 
 		if evaluation.Temperature == 0 {
@@ -3945,6 +3953,13 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			}
 
+			if adminUserInfo.Org.Id == 10206 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60)
+				ultrafiltration_rate = ultrafiltration_rate
+
+				ultrafiltration_rate_one = strconv.FormatFloat(ultrafiltration_rate, 'f', -1, 64)
+			}
+
 			if adminUserInfo.Org.Id == 10694 || adminUserInfo.Org.Id == 10697 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate
@@ -5181,7 +5196,12 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 
-				fmt.Println("record.UltrafiltrationRate ------------------------", record.UltrafiltrationRate)
+			}
+
+			if adminInfo.Org.Id == 10206 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				fmt.Println("ultrafiltration_rate------------------", ultrafiltration_rate)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
@@ -5273,6 +5293,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
+	if adminInfo.Org.Id == 10206 {
+		if ultrafiltration_rate > 0 {
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+		}
+	}
+
 	if adminInfo.Org.Id == 10721 {
 		var replacement_rate float64
 		var displacement_quantity float64

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4231,7 +4231,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//古镇乐生
-	if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+	if adminUserInfo.Org.Id == 10731 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/patient_api_controller.go

@@ -4062,12 +4062,12 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	//	return
 	//}
 
-	if adminUserInfo.CurrentOrgId != 10612 && adminUserInfo.CurrentOrgId != 10460 {
-		if advice.StopState == 1 || advice.ExecutionState == 1 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
-			return
-		}
-	}
+	//if adminUserInfo.CurrentOrgId != 10612 && adminUserInfo.CurrentOrgId != 10460 {
+	//	if advice.StopState == 1 || advice.ExecutionState == 1 {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceStoped)
+	//		return
+	//	}
+	//}
 
 	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 

controllers/stock_in_api_controller.go

@@ -1258,6 +1258,20 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		return
 	}
 
+	if warehouseOut_id == 0 {
+		//查询是否生成出库单
+		warehouseOutObj, _ := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+
+		if warehouseOutObj.ID == 0 {
+			service.AddSigleWarehouseOut(&warehouseOut)
+		}
+
+	}
+
+	if warehouseOut_id > 0 {
+		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id)
+	}
+
 	var warehousingOutInfo []*models.WarehouseOutInfo
 
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
@@ -1392,17 +1406,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			}
 		}
 	}
-	if warehouseOut_id == 0 {
-		//查询是否生成出库单
-		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
-		if errcodes == gorm.ErrRecordNotFound {
-			service.AddSigleWarehouseOut(&warehouseOut)
-		}
-	}
-
-	if warehouseOut_id > 0 {
-		service.UpdateSingleWarehoseOut(warehouseOut_id, storehouse_id)
-	}
 
 	goodWarehouseOut, _ := service.GetLastGoodWarehouseOutTwenty(adminUserInfo.CurrentOrgId)
 
@@ -7237,41 +7240,11 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 	id, _ := this.GetInt64("id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	creater := this.GetAdminUserInfo().AdminUser.Id
-	warehouseOut, errcode := service.GetWarehouseById(id)
-	if errcode != nil {
-		goodErrcode := models.XtGoodErrcode{
-			UserOrgId:      orgId,
-			Errcode:        "查询审核出库单报错",
-			GoodId:         0,
-			Status:         0,
-			Ctime:          0,
-			Mtime:          0,
-			Count:          0,
-			StockCount:     0,
-			Creater:        creater,
-			BatchNumberId:  0,
-			WarehouseOutId: 0,
-		}
-		service.CreateGoodErrcode(goodErrcode)
-	}
+	warehouseOut, _ := service.GetWarehouseById(id)
+
 	//查询已保存的单据
-	warehousingOutInfo, erroce := service.GetWarehouseOutById(id, orgId)
-	if erroce != nil {
-		goodErrcode := models.XtGoodErrcode{
-			UserOrgId:      orgId,
-			Errcode:        "查询已审核出库详情单报错",
-			GoodId:         0,
-			Status:         0,
-			Ctime:          0,
-			Mtime:          0,
-			Count:          0,
-			StockCount:     0,
-			Creater:        creater,
-			BatchNumberId:  0,
-			WarehouseOutId: 0,
-		}
-		service.CreateGoodErrcode(goodErrcode)
-	}
+	warehousingOutInfo, _ := service.GetWarehouseOutById(id, orgId)
+
 	////出库逻辑
 	for _, item := range warehousingOutInfo {
 		// 查询该耗材是否有库存

service/his_service.go

@@ -156,7 +156,7 @@ func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64,
 
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Find(&patients).Error
 	return
 }
 
@@ -165,7 +165,7 @@ func GetScheduleHisPatientListTwo(org_id int64, record_date int64) (patients []*
 
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Find(&patients).Error
 	return
 }
 

service/self_drug_service.go

@@ -1258,14 +1258,26 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 
 func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")
-	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
-	fmt.Println(table)
-	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+	if orgid == 10653 {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0) and (x.stock_max_number>0 or x.stock_min_number>0)")
+		table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+		fmt.Println(table)
+		if orgid > 0 {
+			db = db.Where("x.org_id = ?", orgid)
+		}
+		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+		return info, err
+	} else {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")
+		table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+		fmt.Println(table)
+		if orgid > 0 {
+			db = db.Where("x.org_id = ?", orgid)
+		}
+		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+		return info, err
 	}
-	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
-	return info, err
+
 }
 
 func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.BloodManufacturer, err error) {

service/stock_service.go

@@ -6945,14 +6945,26 @@ func UpdatedGoodInfo(info models.GoodInfo, goodid int64) error {
 
 func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0")
-	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
-	fmt.Println(table)
-	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+	if orgid == 10653 {
+		db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0 and x.stock_count>0")
+		table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+		fmt.Println(table)
+		if orgid > 0 {
+			db = db.Where("x.org_id = ?", orgid)
+		}
+		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+		return info, err
+	} else {
+		db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0")
+		table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+		fmt.Println(table)
+		if orgid > 0 {
+			db = db.Where("x.org_id = ?", orgid)
+		}
+		err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+		return info, err
 	}
-	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
-	return info, err
+
 }
 
 func UpdateDrugWarehouseingInfoSix(id int64, info models.XtDrugWarehouseInfo) error {

service/warhouse_service.go

@@ -8860,7 +8860,6 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 		ProjectId:    goods.ProjectId,
 	}
 	CreatedDialysisPrepare(autoMatic, tx)
-
 	goods.Count = deliver_number - stock_number
 	ConsumableNewHisPrescriptionDelivery(orgID, patient_id, record_time, dialyPrepareOne, warehouseOut, creator, tx)