历史排班

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -380,6 +380,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Chaptalization = dialysisSolution.Chaptalization
+			newprescribe.PrescribingNumber = 1
 			newprescribe.Status = 1
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
 				newprescribe.Remark = dialysisSolution.Remark
@@ -397,6 +398,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DisplaceLiquiValue = 32
 				newprescribe.DialysateFlow = 500
 			}
+
+			if adminUserInfo.Org.Id == 10121 {
+				newprescribe.DialysisDurationHour = 4
+				newprescribe.DialysisDurationMinute = 0
+				newprescribe.BloodAccess = 0
+			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -467,9 +474,15 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Status = 1
 				newprescribe.Remark = lastDialysisPrescribe.Remark
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+				newprescribe.PrescribingNumber = 1
 				if adminUserInfo.Org.Id == 10340 {
 					newprescribe.TargetUltrafiltration = 0
 				}
+				if adminUserInfo.Org.Id == 10121 {
+					newprescribe.DialysisDurationHour = 4
+					newprescribe.DialysisDurationMinute = 0
+					newprescribe.BloodAccess = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -534,10 +547,16 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
+				newprescribe.PrescribingNumber = 1
 
 				if adminUserInfo.Org.Id == 10340 {
 					newprescribe.TargetUltrafiltration = 0
 				}
+				if adminUserInfo.Org.Id == 10121 {
+					newprescribe.DialysisDurationHour = 4
+					newprescribe.DialysisDurationMinute = 0
+					newprescribe.BloodAccess = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()

controllers/patient_api_controller.go

@@ -367,11 +367,32 @@ func (c *PatientApiController) CreatePatient() {
 		Doctor:                       patient.Doctor,
 		RecordNumber:                 patient.RecordNumber,
 		PatientSource:                patient.PatientSource,
+		PatientEndTime:               patient.PatientEndTime,
+		PatientStartTime:             patient.PatientStartTime,
+		InfectiousRemark:             patient.InfectiousRemark,
+		AllergicHistory:              patient.AllergicHistory,
+		PatientAddress:               patient.PatientAddress,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
 	fmt.Print("创建失败", err)
 
+	allergic := models.XtPatientAllergic{
+		UserOrgId:      adminUserInfo.CurrentOrgId,
+		PatientId:      patient.ID,
+		StartTime:      patient.PatientStartTime,
+		EndTime:        patient.PatientEndTime,
+		PatientSource:  patient.PatientSource,
+		PatientAddress: patient.PatientAddress,
+		Remake:         patient.Remark,
+		Status:         1,
+		Ctime:          time.Now().Unix(),
+	}
+
+	if len(patient.PatientAddress) > 0 {
+		service.CreateAllergic(allergic)
+	}
+
 	if len(record_date) > 0 {
 		var recordTime int64
 		timeLayout := "2006-01-02"
@@ -585,10 +606,31 @@ func (c *PatientApiController) EditPatient() {
 		TreatmentPlan:             patient.TreatmentPlan,
 		RecordNumber:              patient.RecordNumber,
 		PatientSource:             patient.PatientSource,
+		PatientStartTime:          patient.PatientStartTime,
+		PatientEndTime:            patient.PatientEndTime,
+		InfectiousRemark:          patient.InfectiousRemark,
+		AllergicHistory:           patient.AllergicHistory,
+		PatientAddress:            patient.PatientAddress,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
 
+	allergic := models.XtPatientAllergic{
+		PatientId:      patient.ID,
+		UserOrgId:      adminUserInfo.CurrentOrgId,
+		StartTime:      patient.PatientStartTime,
+		EndTime:        patient.PatientEndTime,
+		PatientSource:  patient.PatientSource,
+		Status:         1,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		Remake:         patient.Remark,
+		PatientAddress: patient.PatientAddress,
+	}
+	if len(patient.PatientAddress) > 0 {
+		service.CreateAllergic(allergic)
+	}
+
 	nowTimeUinx := time.Now()
 	today := nowTimeUinx.Format("2006-01-02")
 
@@ -755,14 +797,14 @@ func (c *PatientApiController) EditLapseto() {
 
 	err = service.EditPatientLapseto(&patient, &lapseto)
 
-	//if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
-	//	timeStr := time.Now().Format("2006-01-02")
-	//	timeLayout := "2006-01-02 15:04:05"
-	//	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
-	//	timenow := timeStringToTime.Unix()
-	//	service.UpdateScheduleByDeathTime(id, timenow)
-	//	service.UpdateScheduleItemByPatientId(id)
-	//}
+	if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
+		timeStr := time.Now().Format("2006-01-02")
+		timeLayout := "2006-01-02 15:04:05"
+		timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+		timenow := timeStringToTime.Unix()
+		service.UpdateScheduleByDeathTime(id, timenow)
+		service.UpdateScheduleItemByPatientId(id)
+	}
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)
@@ -4931,7 +4973,34 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		patient.PatientStartTime = startTime
 	}
 
+	if patientBody["patient_end_time"] != nil && reflect.TypeOf(patientBody["patient_end_time"]).String() == "string" {
+		patient_end_time := patientBody["patient_end_time"].(string)
+		var endTime int64
+		if len(patient_end_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", patient_end_time+" 00:00:00", loc)
+
+			endTime = theTime.Unix()
+		}
+		patient.PatientEndTime = endTime
+	}
+
+	if patientBody["infectious_remark"] != nil && reflect.TypeOf(patientBody["infectious_remark"]).String() == "string" {
+		record_number := patientBody["infectious_remark"].(string)
+		patient.InfectiousRemark = record_number
+	}
+
+	if patientBody["allergic_history"] != nil && reflect.TypeOf(patientBody["allergic_history"]).String() == "string" {
+		allergic_history := patientBody["allergic_history"].(string)
+		patient.AllergicHistory = allergic_history
+	}
+
+	if patientBody["patient_address"] != nil && reflect.TypeOf(patientBody["patient_address"]).String() == "string" {
+		patient_address := patientBody["patient_address"].(string)
+		patient.PatientAddress = patient_address
+	}
+
 	return
+
 }
 
 func (c *PatientApiController) GetPatientsByKeyWord() {

controllers/patient_dataconfig_api_controller.go

@@ -40,6 +40,8 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/getcontextschedulelist", &PatientDataConfigAPIController{}, "Get:GetContextScheduleList")
 
+	beego.Router("/api/patient/getpatientallagic", &PatientDataConfigAPIController{}, "Get:GetPatientAllagicList")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -1141,3 +1143,14 @@ func (this *PatientDataConfigAPIController) GetContextScheduleList() {
 		"devicenumber": devicenumber,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetPatientAllagicList() {
+
+	id, _ := this.GetInt64("id")
+	fmt.Println("id2ooooooooooooooooooo", id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetPatientAllagicList(id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/self_drug_api_congtroller.go

@@ -3498,52 +3498,60 @@ func (this *SelfDrugApiController) GetDrugWarehouseInfoById() {
 func (this *SelfDrugApiController) GetSendGoodInformation() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	fmt.Println("orgid", orgId)
 	//获取入库数据
-	list, _ := service.GetSendGoodInformation(orgId)
-	for _, it := range list {
-		//查询是否有数据
-		_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
-		//获取总退库数量
-		var cancel_count int64
-		var out_count int64
-		var act_count int64
-		//退库总数量
-		cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range cancellist {
-			cancel_count += item.Count
-		}
-		//出库总数量
-		outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range outlist {
-			out_count += item.Count
-		}
+	list, _ := service.GetSendGoodInformation(10265)
 
-		//实际出库总数量
-		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range actlist {
-			act_count += item.Count
-		}
+	//project, _ := service.GetHisPrescriptionList(10265)
 
-		if errcode == gorm.ErrRecordNotFound {
-			good := models.XtGoodStockCount{
-				UserOrgId:        it.OrgId,
-				GoodId:           it.GoodId,
-				StorehouseId:     it.StorehouseId,
-				Status:           1,
-				Ctime:            time.Now().Unix(),
-				Mtime:            0,
-				StockInCount:     it.WarehousingCount,
-				StockOutCount:    out_count - cancel_count,
-				StockCancelCount: cancel_count,
-				FlushCount:       it.StockCount,
-				StockActOutCount: act_count,
-			}
-			service.CreateGoodCountSix(good)
-		}
-		if errcode == nil {
-			service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
-		}
-	}
+	for _, it := range list {
+		service.UpdateGoodFlow(it.ID, it.PackingPrice)
+	}
+
+	//for _, it := range list {
+	//	//查询是否有数据
+	//	_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
+	//	//获取总退库数量
+	//	var cancel_count int64
+	//	var out_count int64
+	//	var act_count int64
+	//	//退库总数量
+	//	cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range cancellist {
+	//		cancel_count += item.Count
+	//	}
+	//	//出库总数量
+	//	outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range outlist {
+	//		out_count += item.Count
+	//	}
+	//
+	//	//实际出库总数量
+	//	actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range actlist {
+	//		act_count += item.Count
+	//	}
+	//
+	//	if errcode == gorm.ErrRecordNotFound {
+	//		good := models.XtGoodStockCount{
+	//			UserOrgId:        it.OrgId,
+	//			GoodId:           it.GoodId,
+	//			StorehouseId:     it.StorehouseId,
+	//			Status:           1,
+	//			Ctime:            time.Now().Unix(),
+	//			Mtime:            0,
+	//			StockInCount:     it.WarehousingCount,
+	//			StockOutCount:    out_count - cancel_count,
+	//			StockCancelCount: cancel_count,
+	//			FlushCount:       it.StockCount,
+	//			StockActOutCount: act_count,
+	//		}
+	//		service.CreateGoodCountSix(good)
+	//	}
+	//	if errcode == nil {
+	//		service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
+	//	}
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "1",
@@ -3910,6 +3918,7 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 
 		//期中减少
 		outInfo, _ := service.FindeDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
+		fmt.Println("putInfo2o2o2oo2o2", outInfo)
 		for _, it := range outInfo {
 			item.DrugWarehouseOutInfoStartEnd = append(item.DrugWarehouseOutInfoStartEnd, it)
 		}

models/patient_models.go

@@ -225,6 +225,10 @@ type Patients struct {
 	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 	PatientSource            int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
 	PatientStartTime         int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
+	PatientEndTime           int64   `gorm:"column:patient_end_time" json:"patient_end_time" form:"patient_end_time"`
+	InfectiousRemark         string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
+	AllergicHistory          string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
+	PatientAddress           string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 }
 
 func (Patients) TableName() string {
@@ -819,6 +823,10 @@ type XtPatientsNew struct {
 	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 	PatientSource                int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
 	PatientStartTime             int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
+	PatientEndTime               int64   `gorm:"column:patient_end_time" json:"patient_end_time" form:"patient_end_time"`
+	InfectiousRemark             string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
+	AllergicHistory              string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
+	PatientAddress               string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -1978,3 +1986,21 @@ type ConScheduleList struct {
 func (ConScheduleList) TableName() string {
 	return "xt_schedule"
 }
+
+type XtPatientAllergic struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	PatientSource  int64  `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	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"`
+	Remake         string `gorm:"column:remake" json:"remake" form:"remake"`
+	PatientAddress string `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+}
+
+func (XtPatientAllergic) TableName() string {
+	return "xt_patient_allergic"
+}

service/common_service.go

@@ -2506,7 +2506,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1 and r.is_status = 1", orgid).Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1 and r.is_status = 1", orgid).Group("x.patient_id").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
 
 	return inspection, total, err
 }
@@ -2547,7 +2547,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
 	table := readDb.Table("xt_patients as s")
-	fmt.Println(table)
+	//fmt.Println(table)
 	d := readDb.Table(" xt_inspection_reference as r")
 	fmt.Println(d)
 	d2 := readDb.Table("xt_quality_control_standard as d")
@@ -2571,7 +2571,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.min_range<>''and d.user_org_id = ? and d.is_status =1", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.min_range<>''and d.user_org_id = ? and d.is_status =1 and NOT EXISTS(SELECT 1 FROM xt_inspection AS x2 WHERE x2.patient_id = x.patient_id AND x2.org_id = ? AND x2.item_id = x.item_id AND x2.inspect_date > x.inspect_date)", orgid, orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }

service/new_stock_service.go

@@ -165,6 +165,21 @@ func UpdateActSumCount(user_org_id int64, storehouse_id int64, good_id int64, co
 	return err
 }
 
+func GetHisPrescriptionList(orgid int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and record_date =1690819200", orgid).Find(&project).Error
+	return project, err
+}
+
+func UpdateGoodFlow(project_id int64, price float64) error {
+	flow := models.VmStockFlow{}
+
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and user_org_id =10265", project_id).Updates(map[string]interface{}{"price": price}).Error
+
+	err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("warehouse_info_id = ? and org_id =10265", project_id).Updates(map[string]interface{}{"price": price}).Error
+	return err
+}
+
 func GetSendGoodInformation(org_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = XTReadDB().Where("org_id = ? and is_check = 1 and status = 1", org_id).Find(&info).Error

service/new_warehouse_service.go

@@ -87,10 +87,13 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			IsCheck:                 1,
 			OverCount:               sum_count,
 			RegisterNumber:          warehouse.RegisterNumber,
+			BuyPrice:                warehouse.PackingPrice,
 		}
 		warehouseOutInfo.Count = count
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
+
+			fmt.Println("加个我我我哦我我我", goodsInfo.PackingPrice)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -156,7 +159,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -227,7 +230,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 			CreateCancelStockInfoOne(&cancelStockInfo)
@@ -271,7 +274,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -351,7 +354,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		}
 		warehouseOutInfo.Count = stock_number
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -416,7 +419,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -483,7 +486,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 			CreateCancelStockInfoOne(&cancelStockInfo)
@@ -527,7 +530,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -3420,7 +3423,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 		}
 		warehouseOutInfo.Count = count
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -3490,7 +3493,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -3565,7 +3568,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 
@@ -3613,7 +3616,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -3709,7 +3712,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 		}
 		warehouseOutInfo.Count = stock_number
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -3781,7 +3784,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -3851,7 +3854,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 			err := tx.Create(&cancelStockInfo).Error
@@ -3898,7 +3901,7 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -4003,7 +4006,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 		}
 		warehouseOutInfo.Count = count
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -4074,7 +4077,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -4150,7 +4153,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 
@@ -4198,7 +4201,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -4294,7 +4297,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 		}
 		warehouseOutInfo.Count = stock_number
 		if orgID == 9671 || orgID == 10265 {
-			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -4365,7 +4368,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}
@@ -4437,7 +4440,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				IsCheck:         1,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				cancelStockInfo.Price = goodsInfo.PackingPrice
 			}
 
@@ -4485,7 +4488,7 @@ func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64
 				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
-				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
 				flow.Price = goodsInfo.PackingPrice
 				flow.BuyPrice = goodsInfo.BuyPrice
 			}

service/patient_service.go

@@ -766,6 +766,13 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 	return err
 }
 
+func CreateAllergic(allergic models.XtPatientAllergic) error {
+
+	err := XTWriteDB().Model(&allergic).Create(&allergic).Error
+
+	return err
+}
+
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
 	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime}).Error
@@ -880,7 +887,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime, "patient_end_time": patientsNew.PatientEndTime, "infectious_remark": patientsNew.InfectiousRemark, "allergic_history": patientsNew.AllergicHistory, "patient_address": patientsNew.PatientAddress}).Error
 	return err
 }
 
@@ -2944,3 +2951,10 @@ func GetContextScheduleListPatientId(startTime int64, endTime int64, org_id int6
 
 	return schedule, total, err
 }
+
+func GetPatientAllagicList(patient_id int64, user_org_id int64) (list []*models.XtPatientAllergic, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id =? and status= 1", patient_id, user_org_id).Find(&list).Error
+
+	return list, err
+}