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

controllers/dialysis_api_controller.go

@@ -2586,7 +2586,6 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				dewater_amount = 0
 			}
 
-			fmt.Println("dewater_amount----------------", dewater_amount)
 			// 计算透析处方的相关超滤量
 			schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 			var lastDialysisPrescribe *models.DialysisPrescription
@@ -2669,6 +2668,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.RecordDate = recordDate.Unix()
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
 
@@ -2747,6 +2747,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.UpdatedTime = time.Now().Unix()
 					newprescribe.RecordDate = recordDate.Unix()
 					newprescribe.DewaterAmount = dewater_amount
+					newprescribe.PrescriptionWater = dewater_amount
 					newprescribe.TargetUltrafiltration = dewater_amount
 					newprescribe.Status = 1
 					newprescribe.Creater = adminUserInfo.AdminUser.Id
@@ -2990,6 +2991,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.RecordDate = recordDate.Unix()
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			newprescribe.Status = 1
 			if adminUserInfo.CurrentOrgId == 10579 {
@@ -3064,6 +3066,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.RecordDate = recordDate.Unix()
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
@@ -7108,12 +7111,15 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 	appId := this.GetAdminUserInfo().CurrentAppId
 	doctorList, _ := service.GetAllAdminUsers(orgId, appId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"drug":       drug,
-			"config":     config,
-			"doctorList": doctorList,
+			"list":             list,
+			"drug":             drug,
+			"config":           config,
+			"doctorList":       doctorList,
+			"manufacturerList": manufacturerList,
 		})
 		return
 

controllers/his_api_controller.go

@@ -1998,13 +1998,13 @@ func (c *HisApiController) CreateHisPrescription() {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
 													tx.Rollback()
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 													return
 												}
 
 												if prescribing_number > all_count {
 													tx.Rollback()
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 													return
 												}
 											}
@@ -2018,12 +2018,12 @@ func (c *HisApiController) CreateHisPrescription() {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
 													tx.Rollback()
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 													return
 												}
 												if num > all_count {
 													tx.Rollback()
-													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+													c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 													return
 												}
 											}
@@ -2085,12 +2085,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													if drug.IsProject == 0 || drug.IsProject == 2 {
 														if all_count == 0 {
 															tx.Rollback()
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 															return
 														}
 														if prescribing_number > all_count {
 															tx.Rollback()
-															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足,保存失败")
 															return
 														}
 													}
@@ -3659,12 +3659,23 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								//查询改药品是否已经停用
 								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 + "库存不足,保存失败!")
+									return
+
+								}
+
 								service.CreateHisDoctorAdviceOne(&s, tx)
 
 								tx.Commit()
@@ -3737,20 +3748,23 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								}
 
-								//if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
-								//
-								//	if p.Type == 3 {
-								//		//查询该耗材是否停用
-								//		goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-								//		//表示该耗材已经停用，不能保存
-								//		if goodInfoSeven.ID == 0 {
-								//			goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-								//			c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
-								//			return
-								//		}
-								//	}
-								//
-								//}
+								if p.Type == 3 {
+									//查询该耗材是否停用
+									goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+									//表示该耗材已经停用，不能保存
+									if goodInfoSeven.ID == 0 {
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+										return
+									}
+
+									goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+									if goodInfoOne.SumCount == 0 {
+										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+										return
+									}
+
+								}
 
 								//查询保存耗材出库开关是否打开
 								if p.PatientId != 30038 {
@@ -4449,6 +4463,23 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
+								//查询改药品是否已经停用
+								base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+
+								if base.ID > 0 {
+									c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+									return
+
+								}
+
+								drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+
+								if drugMedical.SumCount == 0 {
+									c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+									return
+
+								}
+
 								service.CreateHisDoctorAdvice(&s)
 
 								//记录日志
@@ -4545,20 +4576,22 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								}
 
-								//if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
-								//
-								//	if p.Type == 3 {
-								//		//查询该耗材是否停用
-								//		goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-								//		//表示该耗材已经停用，不能保存
-								//		if goodInfoSeven.ID == 0 {
-								//			goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-								//			c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
-								//			return
-								//		}
-								//	}
-								//
-								//}
+								if p.Type == 3 {
+									//查询该耗材是否停用
+									goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+									//表示该耗材已经停用，不能保存
+									if goodInfoSeven.ID == 0 {
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+										return
+									}
+
+									goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+									if goodInfoOne.SumCount == 0 {
+										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+										return
+									}
+								}
 
 								service.CreateHisProjectTwo(&p)
 								//记录日志

controllers/manage_api_controller.go

@@ -2890,23 +2890,22 @@ func (this *MachineApiController) SaveReminder() {
 		UserOrgId: orgId,
 		Ctime:     time.Now().Unix(),
 	}
-	data, errs := service.GetRemanderData(orgId)
-	if errs == gorm.ErrRecordNotFound {
+	RemanderData, _ := service.GetRemanderData(orgId)
+
+	if RemanderData.ID == 0 {
 		service.CreateRemander(&remander).Error()
-	} else if errs == nil {
+	}
+	if RemanderData.ID > 0 {
 		deviceRemander := models.DeviceRemander{
-			ID:        data.ID,
+			ID:        RemanderData.ID,
 			IsRun:     id,
 			Status:    1,
 			UserOrgId: orgId,
 			Mtime:     time.Now().Unix(),
 		}
 		service.UpdateRemander(&deviceRemander)
-		//if err != nil {
-		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-		//	return
-		//}
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"id": id,
 	})
@@ -5884,7 +5883,7 @@ func (this *MachineApiController) GetNewAirWayDisinfectList() {
 	}
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetNewAirWayDisinfectList(limit, page, startTime, endTime, orgId)
-	fmt.Println("lisitwoowowow", list)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2236,100 +2236,100 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				////针对异常未出库问题的脚本
-				//if adminInfo.Org.Id == 10598 {
-				//
-				//	newadviceInfo := &models.HisDoctorAdviceInfo{
-				//		ID:                    advice.ID,
-				//		UserOrgId:             advice.UserOrgId,
-				//		PatientId:             advice.PatientId,
-				//		HisPatientId:          advice.HisPatientId,
-				//		AdviceType:            advice.AdviceType,
-				//		AdviceDate:            advice.AdviceDate,
-				//		StartTime:             advice.StartTime,
-				//		AdviceName:            advice.AdviceName,
-				//		AdviceDesc:            advice.AdviceDesc,
-				//		ReminderDate:          advice.ReminderDate,
-				//		SingleDose:            advice.SingleDose,
-				//		SingleDoseUnit:        advice.SingleDoseUnit,
-				//		PrescribingNumber:     advice.PrescribingNumber,
-				//		PrescribingNumberUnit: advice.PrescribingNumberUnit,
-				//		DeliveryWay:           advice.DeliveryWay,
-				//		ExecutionFrequency:    advice.ExecutionFrequency,
-				//		AdviceDoctor:          advice.AdviceDoctor,
-				//		Status:                advice.Status,
-				//		CreatedTime:           advice.CreatedTime,
-				//		UpdatedTime:           advice.UpdatedTime,
-				//		AdviceAffirm:          advice.AdviceAffirm,
-				//		Remark:                advice.Remark,
-				//		StopTime:              advice.StopTime,
-				//		StopReason:            advice.StopReason,
-				//		StopDoctor:            advice.StopDoctor,
-				//		StopState:             advice.StopState,
-				//		ParentId:              advice.ParentId,
-				//		ExecutionTime:         advice.ExecutionTime,
-				//		ExecutionStaff:        advice.ExecutionStaff,
-				//		ExecutionState:        advice.ExecutionState,
-				//		Checker:               advice.Checker,
-				//		RecordDate:            advice.RecordDate,
-				//		DialysisOrderId:       advice.DialysisOrderId,
-				//		CheckTime:             advice.CheckTime,
-				//		CheckState:            advice.CheckState,
-				//		DrugSpec:              advice.DrugSpec,
-				//		DrugSpecUnit:          advice.DrugSpecUnit,
-				//		Groupno:               advice.Groupno,
-				//		RemindType:            advice.RemindType,
-				//		FrequencyType:         advice.FrequencyType,
-				//		DayCount:              advice.DayCount,
-				//		WeekDay:               advice.WeekDay,
-				//		TemplateId:            advice.TemplateId,
-				//		Modifier:              advice.Modifier,
-				//		DrugId:                advice.DrugId,
-				//		Price:                 advice.Price,
-				//		PrescriptionId:        advice.PrescriptionId,
-				//		MedListCodg:           advice.MedListCodg,
-				//		FeedetlSn:             advice.FeedetlSn,
-				//		Day:                   advice.DayCount,
-				//		ChildDoctorAdvice:     nil,
-				//		Drug:                  models.Drug{},
-				//		Diagnosis:             advice.Diagnosis,
-				//		Way:                   advice.Way,
-				//		HospApprFlag:          advice.HospApprFlag,
-				//		LmtUsedFlag:           advice.LmtUsedFlag,
-				//		HisOrderInfo:          models.HisOrderInfo{},
-				//		IsMedicine:            advice.IsMedicine,
-				//		ExecutionFrequencyId:  advice.ExecutionFrequencyId,
-				//		Child:                 nil,
-				//		IsSettle:              advice.IsSettle,
-				//		IsMobile:              advice.IsMobile,
-				//		IsSelfDrug:            advice.IsSelfDrug,
-				//		DrugWayCount:          advice.DrugWayCount,
-				//	}
-				//	outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
-				//
-				//	var out_count int64
-				//	if len(outListExport) > 0 {
-				//		for _, item := range outListExport {
-				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-				//				out_count = item.Count * medical.MinNumber
-				//			}
-				//			if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-				//				out_count = item.Count
-				//			}
-				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-				//				out_count = item.Count * medical.MinNumber
-				//			}
-				//
-				//		}
-				//	}
-				//	//按最小单位出库
-				//	//var cha_count = total_count - out_count
-				//	fmt.Println("cha_count--------------------------------------", out_count)
-				//
-				//	var cha_count = 1
-				//	newadviceInfo.PrescribingNumber = float64(cha_count)
-				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
-				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
-				//}
+				if adminInfo.Org.Id == 10644 {
+
+					newadviceInfo := &models.HisDoctorAdviceInfo{
+						ID:                    advice.ID,
+						UserOrgId:             advice.UserOrgId,
+						PatientId:             advice.PatientId,
+						HisPatientId:          advice.HisPatientId,
+						AdviceType:            advice.AdviceType,
+						AdviceDate:            advice.AdviceDate,
+						StartTime:             advice.StartTime,
+						AdviceName:            advice.AdviceName,
+						AdviceDesc:            advice.AdviceDesc,
+						ReminderDate:          advice.ReminderDate,
+						SingleDose:            advice.SingleDose,
+						SingleDoseUnit:        advice.SingleDoseUnit,
+						PrescribingNumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+						DeliveryWay:           advice.DeliveryWay,
+						ExecutionFrequency:    advice.ExecutionFrequency,
+						AdviceDoctor:          advice.AdviceDoctor,
+						Status:                advice.Status,
+						CreatedTime:           advice.CreatedTime,
+						UpdatedTime:           advice.UpdatedTime,
+						AdviceAffirm:          advice.AdviceAffirm,
+						Remark:                advice.Remark,
+						StopTime:              advice.StopTime,
+						StopReason:            advice.StopReason,
+						StopDoctor:            advice.StopDoctor,
+						StopState:             advice.StopState,
+						ParentId:              advice.ParentId,
+						ExecutionTime:         advice.ExecutionTime,
+						ExecutionStaff:        advice.ExecutionStaff,
+						ExecutionState:        advice.ExecutionState,
+						Checker:               advice.Checker,
+						RecordDate:            advice.RecordDate,
+						DialysisOrderId:       advice.DialysisOrderId,
+						CheckTime:             advice.CheckTime,
+						CheckState:            advice.CheckState,
+						DrugSpec:              advice.DrugSpec,
+						DrugSpecUnit:          advice.DrugSpecUnit,
+						Groupno:               advice.Groupno,
+						RemindType:            advice.RemindType,
+						FrequencyType:         advice.FrequencyType,
+						DayCount:              advice.DayCount,
+						WeekDay:               advice.WeekDay,
+						TemplateId:            advice.TemplateId,
+						Modifier:              advice.Modifier,
+						DrugId:                advice.DrugId,
+						Price:                 advice.Price,
+						PrescriptionId:        advice.PrescriptionId,
+						MedListCodg:           advice.MedListCodg,
+						FeedetlSn:             advice.FeedetlSn,
+						Day:                   advice.DayCount,
+						ChildDoctorAdvice:     nil,
+						Drug:                  models.Drug{},
+						Diagnosis:             advice.Diagnosis,
+						Way:                   advice.Way,
+						HospApprFlag:          advice.HospApprFlag,
+						LmtUsedFlag:           advice.LmtUsedFlag,
+						HisOrderInfo:          models.HisOrderInfo{},
+						IsMedicine:            advice.IsMedicine,
+						ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+						Child:                 nil,
+						IsSettle:              advice.IsSettle,
+						IsMobile:              advice.IsMobile,
+						IsSelfDrug:            advice.IsSelfDrug,
+						DrugWayCount:          advice.DrugWayCount,
+					}
+					outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+					fmt.Println(outListExport)
+					//var out_count int64
+					//if len(outListExport) > 0 {
+					//	for _, item := range outListExport {
+					//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+					//			out_count = item.Count * medical.MinNumber
+					//		}
+					//		if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+					//			out_count = item.Count
+					//		}
+					//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+					//			out_count = item.Count * medical.MinNumber
+					//		}
+					//
+					//	}
+					//}
+					//按最小单位出库
+					//var cha_count = total_count - out_count
+
+					var cha_count = 100
+					fmt.Println("cha_count--------------------------------------", cha_count)
+					newadviceInfo.PrescribingNumber = float64(cha_count)
+					newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+					service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				}
 
 			}
 		}
@@ -3350,6 +3350,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.RecordDate = theAssessmentDateTime
 		newprescribe.DewaterAmount = dewater_amount
 		newprescribe.TargetUltrafiltration = dewater_amount
+		newprescribe.PrescriptionWater = dewater_amount
 		newprescribe.Status = 1
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
@@ -3518,6 +3519,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.RecordDate = theAssessmentDateTime
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
@@ -3689,6 +3691,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.RecordDate = theAssessmentDateTime
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
+			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Status = 1
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -82,13 +82,16 @@ func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 	}
 
 	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
+
+	scheduleRemark, _ := service.GetStaffScheduleRemark(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"staffList": staffList,
+		"staffList":      staffList,
+		"scheduleRemark": scheduleRemark,
 	})
 }
 
@@ -122,13 +125,15 @@ func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 	}
 
 	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
+	scheduleRemark, _ := service.GetStaffScheduleRemark(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"staffList": staffList,
+		"staffList":      staffList,
+		"scheduleRemark": scheduleRemark,
 	})
 }
 

controllers/patient_api_controller.go

@@ -160,6 +160,8 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletepatientlapsorecord", &DialysisApiController{}, "Get:DeletePatientLapseRecord")
 
+	beego.Router("/api/patient/getpatientlapselist", &DialysisApiController{}, "Get:GetPatientLapaseList")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -399,6 +401,7 @@ func (c *PatientApiController) CreatePatient() {
 	patient.FirstLetter = firstLetter
 
 	err := service.CreatePatient(&patient, contagions, diseases)
+
 	fmt.Println("创建病人失败err")
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePatient)
@@ -407,6 +410,27 @@ func (c *PatientApiController) CreatePatient() {
 
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
+	creater := adminUserInfo.AdminUser.Id
+	record := models.XtPatientLaspseRecord{
+		PatientId:     patients.ID,
+		RecordDate:    time.Now().Unix(),
+		LapseDate:     time.Now().Unix(),
+		LapseType:     1,
+		LapseClass:    0,
+		LapseReason:   "",
+		AdminUserId:   creater,
+		Remark:        "",
+		UserOrgId:     0,
+		Ctime:         time.Now().Unix(),
+		Mtime:         time.Now().Unix(),
+		Status:        1,
+		LapseTypeName: "转入",
+		HisType:       0,
+		HisZone:       "",
+		HisBed:        "",
+	}
+	service.CreatePatientRecord(record)
+
 	patientsNew := models.XtPatientsNew{
 		UserOrgId:                    adminUserInfo.CurrentOrgId,
 		UserId:                       0,
@@ -7548,10 +7572,38 @@ func (c *PatientApiController) SavePatientLapse() {
 
 	lapse_reason := dataBody["lapse_reason"].(string)
 
-	start_time := dataBody["record_date"].(string)
+	record_date := dataBody["record_date"].(string)
+
+	lapse_type_name := dataBody["lapse_type_name"].(string)
+
+	his_bed := dataBody["his_bed"].(string)
+
+	his_zone := dataBody["his_zone"].(string)
+
+	his_type := int64(dataBody["his_type"].(float64))
+
+	patient_address := dataBody["patient_address"].(string)
+
+	start_time := dataBody["start_time"].(string)
+
+	end_time := dataBody["end_time"].(string)
+
+	start_time_one := dataBody["start_time_one"].(string)
+
+	end_time_one := dataBody["end_time_one"].(string)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
+
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -7562,30 +7614,91 @@ func (c *PatientApiController) SavePatientLapse() {
 		startTime = theTime.Unix()
 	}
 
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	var startTimeOne int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTimeOne = theTime.Unix()
+	}
+
+	var endTimeOne int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTimeOne = theTime.Unix()
+	}
+
 	remark := dataBody["remark"].(string)
 
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 
 	record := models.XtPatientLaspseRecord{
-		PatientId:   patient_id,
-		RecordDate:  startTime,
-		LapseDate:   startTime,
-		LapseType:   lapse_type,
-		LapseClass:  lapse_class,
-		LapseReason: lapse_reason,
-		AdminUserId: admin_user_id,
-		Remark:      remark,
-		UserOrgId:   org_id,
-		Ctime:       time.Now().Unix(),
-		Mtime:       time.Now().Unix(),
-		Status:      1,
+		PatientId:      patient_id,
+		RecordDate:     recordDate,
+		LapseDate:      recordDate,
+		LapseType:      lapse_type,
+		LapseClass:     lapse_class,
+		LapseReason:    lapse_reason,
+		AdminUserId:    admin_user_id,
+		Remark:         remark,
+		UserOrgId:      org_id,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		Status:         1,
+		LapseTypeName:  lapse_type_name,
+		HisBed:         his_bed,
+		HisType:        his_type,
+		HisZone:        his_zone,
+		StartTime:      startTime,
+		EndTime:        endTime,
+		StartTimeOne:   startTimeOne,
+		EndTimeOne:     endTimeOne,
+		PatientAddress: patient_address,
 	}
 
 	//病人转出
-	if lapse_type == 1 {
-		service.UpdateScheduleByDeathTime(patient_id, startTime)
+	if lapse_type == 2 {
+
+		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate)
+
+		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+
+		service.UpdateScheduleItemByPatientId(patient_id)
+	}
+
+	//病人转出
+	if lapse_type == 3 {
+
+		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate)
+
+		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+
 		service.UpdateScheduleItemByPatientId(patient_id)
 	}
+
+	//病人转出
+	if lapse_type == 1 {
+
+		service.UpdatePatientLapsetoByPatientIdTwo(patient_id, recordDate)
+
+	}
+
 	service.CreatePatientRecord(record)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -7639,10 +7752,39 @@ func (c *DialysisApiController) UpdatePatientLapseRecord() {
 
 	lapse_reason := dataBody["lapse_reason"].(string)
 
-	start_time := dataBody["record_date"].(string)
+	record_date := dataBody["record_date"].(string)
+
+	lapse_type_name := dataBody["lapse_type_name"].(string)
+
+	his_bed := dataBody["his_bed"].(string)
+
+	his_zone := dataBody["his_zone"].(string)
+
+	his_type := int64(dataBody["his_type"].(float64))
+
+	patient_address := dataBody["patient_address"].(string)
+
+	start_time := dataBody["start_time"].(string)
+
+	end_time := dataBody["end_time"].(string)
+
+	start_time_one := dataBody["start_time_one"].(string)
+
+	end_time_one := dataBody["end_time_one"].(string)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+
+	var recordDate int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
+
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -7653,6 +7795,36 @@ func (c *DialysisApiController) UpdatePatientLapseRecord() {
 		startTime = theTime.Unix()
 	}
 
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	var startTimeOne int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTimeOne = theTime.Unix()
+	}
+
+	var endTimeOne int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTimeOne = theTime.Unix()
+	}
+
 	remark := dataBody["remark"].(string)
 
 	id := int64(dataBody["id"].(float64))
@@ -7660,27 +7832,54 @@ func (c *DialysisApiController) UpdatePatientLapseRecord() {
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 
 	record := models.XtPatientLaspseRecord{
-		ID:          id,
-		PatientId:   patient_id,
-		RecordDate:  startTime,
-		LapseDate:   startTime,
-		LapseType:   lapse_type,
-		LapseClass:  lapse_class,
-		LapseReason: lapse_reason,
-		AdminUserId: admin_user_id,
-		Remark:      remark,
-		UserOrgId:   org_id,
-		Ctime:       time.Now().Unix(),
-		Mtime:       time.Now().Unix(),
-		Status:      1,
+		ID:             id,
+		PatientId:      patient_id,
+		RecordDate:     recordDate,
+		LapseDate:      recordDate,
+		LapseType:      lapse_type,
+		LapseClass:     lapse_class,
+		LapseReason:    lapse_reason,
+		AdminUserId:    admin_user_id,
+		Remark:         remark,
+		UserOrgId:      org_id,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		Status:         1,
+		LapseTypeName:  lapse_type_name,
+		HisZone:        his_zone,
+		HisBed:         his_bed,
+		HisType:        his_type,
+		StartTime:      startTime,
+		StartTimeOne:   startTimeOne,
+		EndTime:        endTime,
+		EndTimeOne:     endTimeOne,
+		PatientAddress: patient_address,
 	}
 
 	//病人转出
-	if lapse_type == 1 {
-		service.UpdateScheduleByDeathTime(patient_id, startTime)
+	if lapse_type == 2 {
+		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate)
+
+		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+
+		service.UpdateScheduleItemByPatientId(patient_id)
+	}
+
+	if lapse_type == 3 {
+		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate)
+
+		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+
 		service.UpdateScheduleItemByPatientId(patient_id)
 	}
 
+	//病人转出
+	if lapse_type == 1 {
+
+		service.UpdatePatientLapsetoByPatientIdTwo(patient_id, recordDate)
+
+	}
+
 	service.SavePatientLapseRecord(record)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -7699,3 +7898,17 @@ func (c *DialysisApiController) DeletePatientLapseRecord() {
 	})
 
 }
+
+func (c *DialysisApiController) GetPatientLapaseList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetPatientAllagicListOne(orgId)
+
+	fmt.Println("lsit", list)
+
+	//for _, item := range list {
+	//
+	//
+	//}
+}

controllers/stock_in_api_controller.go

@@ -8055,27 +8055,38 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 
 func (this *StockManagerApiController) UpdateGoodInfoByUserOrgId() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	info, _ := service.GetAllWareHouseOutByUserOrg(orgId)
-
-	if len(info) > 0 {
-		for _, item := range info {
-			dealer, _ := service.GetDealerById(item.Dealer)
-
-			//manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
-			service.UpdateGoodInfoByUserOrgIdTwo(item.ID, dealer.DealerName)
-		}
-	}
-	//goodList, _ := service.GetAllGoodList(orgId)
+	//info, _ := service.GetAllWareHouseOutByUserOrg(10633)
 	//
-	//for _, item := range goodList {
+	//if len(info) > 0 {
+	//	for _, item := range info {
 	//
-	//	good_type_name := service.GetAllGoodTypeName(item.GoodTypeId, orgId)
+	//		//dealer, _ := service.GetDealerById(item.Dealer)
 	//
-	//	service.UpdateGoodTypeName(item.ID, good_type_name)
+	//		//manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//
+	//		//service.UpdateGoodInfoByUserOrgIdTwo(item.ID, dealer.DealerName)
+	//	}
 	//}
+	goodList, _ := service.GetAllGoodList(10633)
+
+	for _, item := range goodList {
+		service.UpdateStockFlowByList(item.ID, item.PackingPrice)
+		//service.UpdateWarehouseOutInfoByPrice(item.ID, item.PackingPrice)
+
+		//outList, _ := service.GetWarehosueOutInfoByPrice(item.ID, 10633)
+		//
+		//for _, it := range outList {
+		//	//service.UpdateWarehouseOut(it.ID, item.PackingPrice)
+		//
+		//	service.UpdateStockFlowByList(it.GoodId, item.PackingPrice)
+		//}
+
+		//good_type_name := service.GetAllGoodTypeName(item.GoodTypeId, orgId)
+		//
+		//service.UpdateGoodTypeName(item.ID, good_type_name)
+	}
 
 	//
 	//for _, item := range goodList {

models/dialysis.go

@@ -1514,6 +1514,7 @@ type HisDoctorAdviceFourty struct {
 	IsSettle              int64                    `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 	Drug                  Drug                     `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	IsSelfDrug            int64                    `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	DeliveryWay           string                   `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 }
 
 func (HisDoctorAdviceFourty) TableName() string {

models/drug.go

@@ -297,6 +297,7 @@ type BaseDrugLibTwenty struct {
 	DoseUnit       string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugStatus     string `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	DrugStockLimit string `gorm:"column:drug_stock_limit" json:"drug_stock_limit_count" form:"drug_stock_limit"`
+	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 }
 
 func (BaseDrugLibTwenty) TableName() string {

models/good_models.go

@@ -241,6 +241,7 @@ type GoodInfoSeven struct {
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	GoodStatus        string `gorm:"column:good_status" json:"good_status" form:"good_status"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	SumCount          int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (GoodInfoSeven) TableName() string {
@@ -424,6 +425,7 @@ type GoodInformationFourty struct {
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	Status            int64  `gorm:"column:status" json:"status"`
 	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	SumCount          int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (GoodInformationFourty) TableName() string {

models/patient_models.go

@@ -2766,19 +2766,28 @@ func (XtTreatmentPlan) TableName() string {
 }
 
 type XtPatientLaspseRecord struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	LapseDate   int64  `gorm:"column:lapse_date" json:"lapse_date" form:"lapse_date"`
-	LapseType   int64  `gorm:"column:lapse_type" json:"lapse_type" form:"lapse_type"`
-	LapseClass  int64  `gorm:"column:lapse_class" json:"lapse_class" form:"lapse_class"`
-	LapseReason string `gorm:"column:lapse_reason" json:"lapse_reason" form:"lapse_reason"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Remark      string `gorm:"column:remark" json:"remark" form:"remark"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate     int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	LapseDate      int64  `gorm:"column:lapse_date" json:"lapse_date" form:"lapse_date"`
+	LapseType      int64  `gorm:"column:lapse_type" json:"lapse_type" form:"lapse_type"`
+	LapseClass     int64  `gorm:"column:lapse_class" json:"lapse_class" form:"lapse_class"`
+	LapseReason    string `gorm:"column:lapse_reason" json:"lapse_reason" form:"lapse_reason"`
+	AdminUserId    int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	LapseTypeName  string `gorm:"column:lapse_type_name" json:"lapse_type_name" form:"lapse_type_name"`
+	HisType        int64  `gorm:"column:his_type" json:"his_type" form:"his_type"`
+	HisZone        string `gorm:"column:his_zone" json:"his_zone" form:"his_zone"`
+	HisBed         string `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
+	PatientAddress string `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	StartTimeOne   int64  `gorm:"column:start_time_one" json:"start_time_one" form:"start_time_one"`
+	EndTimeOne     int64  `gorm:"column:end_time_one" json:"end_time_one" form:"end_time_one"`
 }
 
 func (XtPatientLaspseRecord) TableName() string {

models/self_drug_models.go

@@ -81,6 +81,7 @@ type XtBaseDrug struct {
 	TotalCountTwo          int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
 	IsShow                 int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
 	IsSelfDrug             int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	SumCount               int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (XtBaseDrug) TableName() string {

service/patient_service.go

@@ -1955,7 +1955,29 @@ func CreateExportPatient(patient *models.Patients, contagions []int64, org_creat
 		BloodId:           patient.ID,
 		Avatar:            "https://images.shengws.com/201809182128111.png",
 	}
+
 	err = utx.Create(&patientsNew).Error
+
+	record := models.XtPatientLaspseRecord{
+		PatientId:     patient.ID,
+		RecordDate:    time.Now().Unix(),
+		LapseDate:     time.Now().Unix(),
+		LapseType:     1,
+		LapseClass:    0,
+		LapseReason:   "",
+		AdminUserId:   org_creator,
+		Remark:        "",
+		UserOrgId:     patient.UserOrgId,
+		Ctime:         time.Now().Unix(),
+		Mtime:         time.Now().Unix(),
+		Status:        1,
+		LapseTypeName: "转入",
+		HisType:       0,
+		HisZone:       "",
+		HisBed:        "",
+	}
+	err = utx.Create(&record).Error
+
 	if err != nil {
 		utx.Rollback()
 		btx.Rollback()
@@ -2103,6 +2125,33 @@ func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
 	return err
 }
 
+func UpdatePatientLapsetoByPatientId(patient_id int64, record_date int64) error {
+
+	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2}).Error
+
+	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2}).Error
+
+	return err
+}
+
+func UpdatePatientLapsetoByPatientIdOne(patient_id int64, record_date int64) error {
+
+	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3}).Error
+
+	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3}).Error
+
+	return err
+}
+
+func UpdatePatientLapsetoByPatientIdTwo(patient_id int64, record_date int64) error {
+
+	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 1}).Error
+
+	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 1}).Error
+
+	return err
+}
+
 func UpdateScheduleItemByPatientId(id int64) error {
 
 	err := XTWriteDB().Model(models.PatientScheduleTemplateItem{}).Where("patient_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
@@ -3072,6 +3121,13 @@ func GetPatientAllagicList(patient_id int64, user_org_id int64) (list []*models.
 	return list, err
 }
 
+func GetPatientAllagicListOne(user_org_id int64) (list []*models.XtPatientAllergic, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and status= 1", user_org_id).Find(&list).Error
+
+	return list, err
+}
+
 func GetNewMonitorRecord(orgID int64, date int64, partition int64, patientId int64) ([]*models.NewMonitorDialysisScheduleList, error) {
 	var mds []*models.NewMonitorDialysisScheduleList
 
@@ -4124,7 +4180,7 @@ func GetPatientLapseRecord(patient_id int64, limit int64, page int64, user_org_i
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&record).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&record).Error
 
 	return record, total, err
 }

service/stock_service.go

@@ -9462,3 +9462,31 @@ func CreateSelfDrugFlowOne(flow models.XtSelfDrugFlow, tx *gorm.DB) error {
 	}
 	return err
 }
+
+func UpdateWarehouseOutInfoByPrice(good_id int64, packing_price float64) error {
+
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("good_id =? and status =1 and is_check=1", good_id).Updates(map[string]interface{}{"packing_price": packing_price}).Error
+
+	return err
+}
+
+func GetWarehosueOutInfoByPrice(good_id int64, org_id int64) (out []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and org_id = ? and status=1 and price =0", good_id, org_id).Find(&out).Error
+
+	return out, err
+}
+
+func UpdateWarehouseOut(good_id int64, packing_price float64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("id = ? and status=1", good_id).Updates(map[string]interface{}{"price": packing_price}).Error
+
+	return err
+}
+
+func UpdateStockFlowByList(good_id int64, packing_price float64) error {
+
+	err := XTWriteDB().Model(models.VmStockFlow{}).Where("good_id = ? and user_org_id = 10633 and status=1", good_id).Updates(map[string]interface{}{"price": packing_price}).Error
+
+	return err
+}