2024/6/17

controllers/base_api_controller.go

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

controllers/dialysis_api_controller.go

@@ -4481,6 +4481,15 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//接诊评估
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
+	if receiverTreatmentAccess.Condition == 1 {
+		if len(receiverTreatmentAccess.AdmissionNumber) == 0 || receiverTreatmentAccess.AdmissionNumber == "" {
+			lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.CurrentOrgId, patientInfo.ID)
+			receiverTreatmentAccess.AdmissionNumber = lastAcceptTreatment.AdmissionNumber
+			receiverTreatmentAccess.HisDepartment = lastAcceptTreatment.HisDepartment
+			receiverTreatmentAccess.HisBed = lastAcceptTreatment.HisBed
+		}
+	}
+
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 10345 {
@@ -4859,12 +4868,14 @@ func (c *DialysisApiController) GetLongAdviceOne() {
 		for _, advice := range advices_two {
 			p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
 			now := p.Unix()
+
 			dayStr := strconv.FormatInt(advice.DayCount, 10)
 			dayStr2 := "-" + dayStr
 			count, _ := strconv.ParseInt(dayStr2, 10, 64)
 			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+			fmt.Println("oldTime--------------------------", oldTime)
 			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.CurrentOrgId, advice.TemplateId)
-
+			fmt.Println("advices-------------------------", advices)
 			for _, ad := range advices {
 				advice_three = append(advice_three, ad)
 			}
@@ -4952,10 +4963,12 @@ func (c *DialysisApiController) GetLongAdviceTwo() {
 		for _, advice := range advices_two {
 			p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
 			now := p.Unix()
+			fmt.Println("now-------------------------", now)
 			dayStr := strconv.FormatInt(advice.DayCount, 10)
 			dayStr2 := "-" + dayStr
 			count, _ := strconv.ParseInt(dayStr2, 10, 64)
 			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+			fmt.Println("oldTime--------------------------", oldTime)
 			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.CurrentOrgId, advice.TemplateId)
 
 			for _, ad := range advices {

controllers/drug_stock_api_contorller.go

@@ -3515,6 +3515,7 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	order_type, _ := c.GetInt64("order_type")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -3543,7 +3544,7 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	dealerList, _ := service.GetAllDealerList(orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if order_type == 2 {
-		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId, storehouse_id)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list":             list,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1327,14 +1327,6 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		//}
 		// 查询信息规挡的设置天数
 
-		if adminUserInfo.Org.Id == 10340 {
-			if condition == 1 {
-				lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.Org.Id, id)
-				if receiveTreatmentAsses.AdmissionNumber == "" {
-					receiveTreatmentAsses.AdmissionNumber = lastAcceptTreatment.AdmissionNumber
-				}
-			}
-		}
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
 		if infor.ID > 0 && infor.WeekDay > 0 {
 
@@ -1363,6 +1355,15 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 
 		receiveTreatmentAsses.Modifier = adminUserInfo.AdminUser.Id
 		receiveTreatmentAsses.ID = receiveTreatment.ID
+
+		if adminUserInfo.Org.Id == 10340 {
+			if condition == 1 {
+				lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.Org.Id, id)
+				if receiveTreatmentAsses.AdmissionNumber == "" {
+					receiveTreatmentAsses.AdmissionNumber = lastAcceptTreatment.AdmissionNumber
+				}
+			}
+		}
 		err := service.UpadateReceiveTreatmentAsses(&receiveTreatmentAsses)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":receive_treatment_asses"
 		redis := service.RedisClient()
@@ -5115,6 +5116,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		defer redis.Close()
 
 	}
+
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
@@ -5140,6 +5142,77 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		}
 	}
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
+	//修改床位后重新生成消毒计划
+	if adminUserInfo.Org.Id == 10340 {
+		//根据床位号获取设备型号
+		unitType, _ := service.GetUnitType(dialysisRecord.BedID, dialysisRecord.UserOrgId)
+		//查询使用消毒最后一条消毒记录
+		_, err := service.GetLaseDeviceInfomation(dialysisRecord.UserOrgId, dialysisRecord.BedID, dialysisRecord.DialysisDate, dialysisRecord.SchedualType)
+		fmt.Println("err", err)
+		if err == gorm.ErrRecordNotFound {
+			//查找排班
+			scheduleByPatient, _ := service.GetScheduleByPatient(dialysisRecord.PatientId, dialysisRecord.DialysisDate, dialysisRecord.UserOrgId)
+			//查询改设备是否有消毒计划
+			plan, errcode := service.GetDisInfectionTime(dialysisRecord.UserOrgId, unitType.UnitType, dialysisRecord.SchedualType, scheduleByPatient.ScheduleWeek)
+
+			//根据床位号获取设备id
+			addmacher, _ := service.GetEquimentIDTwo(dialysisRecord.BedID, dialysisRecord.UserOrgId)
+
+			//查询病人信息
+			patients, _ := service.GetPatientInfoMation(dialysisRecord.PatientId)
+			var con = ""
+			if patients.IsInfectious == 0 {
+				con = ""
+			}
+			if patients.IsInfectious == 1 {
+				con = "无"
+			}
+			if patients.IsInfectious == 2 {
+				con = "有"
+			}
+
+			if errcode == nil {
+				var end_time int64
+				end_time = dialysisRecord.EndTime + plan.DisinfecTime*60
+				//新增消毒
+				information := models.DeviceInformation{
+					Date:                  dialysisRecord.DialysisDate,
+					Zone:                  dialysisRecord.ZoneId,
+					Class:                 dialysisRecord.SchedualType,
+					BedNumber:             dialysisRecord.BedID,
+					PatientId:             dialysisRecord.PatientId,
+					DialysisMode:          scheduleByPatient.ModeId,
+					LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
+					Disinfection:          1,
+					DialysisConcentration: 1,
+					DisinfectionStatus:    1,
+					Move:                  1,
+					UserOrgId:             dialysisRecord.UserOrgId,
+					DisinfectType:         plan.Way,
+					DisinfectantType:      plan.MachineDisinfectant,
+					FluidPath:             plan.DisinfectanWay, //液路消毒方式
+					Disinfectant:          plan.Disinfectant,
+					Ctime:                 time.Now().Unix(),
+					Status:                1,
+					SignName:              nurseID,
+					EquimentId:            addmacher.ID,
+					DisinfectionResidue:   2,
+					Bed:                   addmacher.BedNumber,
+					StartTime:             dialysisRecord.StartTime,
+					EndTime:               dialysisRecord.EndTime,
+					Contagion:             con,
+					WeightLoss:            0,
+					Hyperfiltratio:        0,
+					DialysisHour:          "",
+					MachineRun:            1,
+					DisinfecStartime:      dialysisRecord.EndTime,
+					DisinfecEndtime:       end_time,
+				}
+				err := service.CreateInformationTwo(&information)
+				fmt.Println("报错", err)
+			}
+		}
+	}
 	order, _ := service.GetLastPatientOrder(record_id)
 	service.UpdateMobilePatient(adminUserInfo.Org.Id, order.PatientId, schedule_remark)
 	redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1375,7 +1375,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-									if advice.UserOrgId != 10278 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1391,7 +1391,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1547,7 +1547,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-									if advice.UserOrgId != 10278 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1561,7 +1561,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -5680,6 +5680,15 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	//接诊评估
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
+	if receiverTreatmentAccess.Condition == 1 {
+		if len(receiverTreatmentAccess.AdmissionNumber) == 0 || receiverTreatmentAccess.AdmissionNumber == "" {
+			lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.Org.Id, patientInfo.ID)
+			receiverTreatmentAccess.AdmissionNumber = lastAcceptTreatment.AdmissionNumber
+			receiverTreatmentAccess.HisDepartment = lastAcceptTreatment.HisDepartment
+			receiverTreatmentAccess.HisBed = lastAcceptTreatment.HisBed
+		}
+	}
+
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
 	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)

controllers/patient_api_controller.go

@@ -1054,11 +1054,13 @@ func (c *PatientApiController) GetPatient() {
 	infections, _ := service.GetAllInfectionRecord(infectiousRecord.InspectDate, adminUserInfo.CurrentOrgId, patient.ID, infectiousRecord.ProjectId)
 	diseases := service.GetPatientDiseases(patient.ID)
 	contagions := service.GetPatientContagions(patient.ID)
+	patientVascularAccessOne, _ := service.GetPatientVascularAccessOne(patient.ID)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"patient":    patient,
-		"diseases":   diseases,
-		"contagions": contagions,
-		"infections": infections,
+		"patient":                  patient,
+		"diseases":                 diseases,
+		"contagions":               contagions,
+		"infections":               infections,
+		"patientVascularAccessOne": patientVascularAccessOne,
 	})
 	return
 }

controllers/print_data_api_controller.go

@@ -51,6 +51,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Prescription = prescription
 			//接诊评估
 			receiveTreatmentAsses, _ := service.GetBatchReceiveTreatmentAsses(this.GetAdminUserInfo().CurrentOrgId, item.PatientID, item.ScheduleDate)
+			if receiveTreatmentAsses.Condition == 1 {
+				if len(receiveTreatmentAsses.AdmissionNumber) == 0 || receiveTreatmentAsses.AdmissionNumber == "" {
+					lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminUserInfo.CurrentOrgId, item.PatientID)
+					receiveTreatmentAsses.AdmissionNumber = lastAcceptTreatment.AdmissionNumber
+					receiveTreatmentAsses.HisDepartment = lastAcceptTreatment.HisDepartment
+					receiveTreatmentAsses.HisBed = lastAcceptTreatment.HisBed
+				}
+			}
 			item.ReceiveAssessment = receiveTreatmentAsses
 
 			//透前评估

controllers/stock_in_api_controller.go

@@ -408,6 +408,8 @@ func (c *StockManagerApiController) CreateWarehouse() {
 				license_number, _ := items["license_number"].(string)
 
 				register_number, _ := items["register_number"].(string)
+
+				good_code, _ := items["good_code"].(string)
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					ID:               id,
@@ -434,6 +436,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					StorehouseId:     storehouse_id,
 					IsCheck:          2,
 					RegisterNumber:   register_number,
+					GoodCode:         good_code,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -684,6 +687,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
 				register_number, _ := items["register_number"].(string)
+				good_code, _ := items["good_code"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -716,6 +720,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
 						RegisterNumber:   register_number,
+						GoodCode:         good_code,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -744,6 +749,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						RegisterNumber:   register_number,
+						GoodCode:         good_code,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -769,6 +775,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
 						RegisterNumber:      register_number,
+						GoodCode:            good_code,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -7645,6 +7652,7 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				IsCheck:                 1,
 				OverCount:               flush_count,
 				OperateTime:             time.Now().Unix(),
+				GoodCode:                item.GoodCode,
 			}
 			//创建出库流水
 			service.CreateStockFlowOne(stockFlow)

models/new_stock_models.go

@@ -174,6 +174,7 @@ type NewBaseDrugOne struct {
 	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 	MedicalInsuranceLevel  int64                  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	IsSelfDrug             int64                  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (NewBaseDrugOne) TableName() string {
@@ -424,6 +425,7 @@ type VmBaseDrugTwenty struct {
 	Ctime                            int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                            int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsSelfDrug                       int64             `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	MedicalInsuranceNumber           string            `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugFlowWarehouseInfo            []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_flow_info"`
 	DrugActFlowWarehouseInfo         []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_act_flow_info"`

models/stock_models.go

@@ -107,6 +107,7 @@ type StWarehousingInfo struct {
 	StorehouseId          int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	WarehousingTime       string  `json:"warehousing_time"`
+	PackingPrice          float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
 
 func (StWarehousingInfo) TableName() string {
@@ -176,6 +177,7 @@ type WarehousingInfo struct {
 	RegisterNumber            string      `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	ManafacturerName          string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
 	DealerName                string      `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	GoodCode                  string      `gorm:"column:good_code" json:"good_code" form:"good_code"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -700,6 +702,7 @@ type VmStockFlow struct {
 	Remark                    string          `gorm:"column:remark" json:"remark" form:"remark"`
 	FlushOverCount            int64           `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 	OperateTime               int64           `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	GoodCode                  string          `gorm:"column:good_code" json:"good_code" form:"good_code"`
 }
 
 func (VmStockFlow) TableName() string {
@@ -1541,6 +1544,7 @@ type VmWarehousingInfoSix struct {
 	StorehouseId              int64    `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64    `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	RegisterNumber            string   `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	GoodCode                  string   `gorm:"column:good_code" json:"good_code" form:"good_code"`
 }
 
 func (VmWarehousingInfoSix) TableName() string {

service/drug_stock_service.go

@@ -261,7 +261,7 @@ func GetDrugOutOrderPrintList(startime int64, endtime int64, orgid int64) (list
 	return list, err
 }
 
-func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
+func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64, storehouse_id int64) (list []*models.SgjDrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_out_info").Where("status = 1 and is_check=1")
 	if startime > 0 {
@@ -273,6 +273,9 @@ func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (l
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id=?", storehouse_id)
+	}
 	err = db.Preload("XtDrugWarehouseInfo", "status=1 and org_id =?", orgid).Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
 	return list, err
 }

service/his_project_service.go

@@ -788,6 +788,12 @@ func GetPatientVascularAccess(patient_id int64) (models.XtPatientVascularAccess,
 	return access, err
 }
 
+func GetPatientVascularAccessOne(patient_id int64) (models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err = XTReadDB().Where("patient_id = ? and status = 1 and user_status =1", patient_id).Last(&access).Error
+	return access, err
+}
+
 func CreateHisProjectTh11o(project models.HisProject) error {
 
 	err := XTWriteDB().Model(&project).Create(&project).Error

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -491,6 +491,8 @@ type ReceiveAssessmentVM struct {
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
 	AdmissionNumber              string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
 	UserOrgId                    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisDepartment                string `gorm:"column:his_department" json:"his_department" form:"his_department"`
+	HisBed                       string `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
 }
 
 func (ReceiveAssessmentVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -431,6 +431,13 @@ func GetBatchReceiveTreatmentAsses(orgid int64, patient_id int64, record_date in
 	return receiveAssessmentVM, err
 }
 
+func GetLastAcceptTreatment(user_org_id int64, patient_id int64) (models.ReceiveTreatmentAsses, error) {
+
+	treatmentAsses := models.ReceiveTreatmentAsses{}
+	err := p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and status=1 and admission_number<>''", user_org_id, patient_id).Last(&treatmentAsses).Error
+	return treatmentAsses, err
+}
+
 func GetBatchAssessmentBeforeDislysisVM(orgid int64, patient_id int64, assessment_date int64) (AssessmentBeforeDislysisVM, error) {
 
 	AssessmentBeforeDislysisVM := AssessmentBeforeDislysisVM{}

service/self_drug_service.go

@@ -1880,7 +1880,7 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',x.drug_status) = 0")
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',x.drug_status) = 0 and x.is_self_drug!=1")
 	if good_type == 2 {
 		db = db.Where("x.sum_count<=x.drug_stock_limit")
 	}
@@ -1899,7 +1899,7 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	}
 
 	if len(keyword) > 0 {
-		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
+		db = db.Where("x.drug_name like ? or x.manufacturer in(?)", likeKey, ids)
 	}
 
 	if orgId > 0 {
@@ -2903,7 +2903,7 @@ func GetEndLastFlowTwenty(goodid int64, orgid int64, endtime int64) (models.VmSt
 
 func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
 
-	db := XTReadDB().Model(&druginfo).Where("status = 1")
+	db := XTReadDB().Model(&druginfo).Where("status = 1 and is_self_drug!=1")
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	if good_type > 0 {

service/stock_service.go

@@ -467,7 +467,7 @@ func CreateWarehousingInfo(warehousingInfo []*models.WarehousingInfo) (err error
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -490,6 +490,7 @@ func CreateWarehousingInfo(warehousingInfo []*models.WarehousingInfo) (err error
 				insertData = append(insertData, info.LicenseNumber)
 				insertData = append(insertData, info.PackingPrice)
 				insertData = append(insertData, info.StorehouseId)
+				insertData = append(insertData, info.GoodCode)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -6214,10 +6215,9 @@ func GetLastWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
-func GetLastWarehouseInfoTwo(goodid int64, storehouse_id int64, user_org_id int64) (models.WarehousingInfo, error) {
+func GetLastWarehouseInfoTwo(goodid int64, storehouse_id int64, user_org_id int64) (info []*models.WarehousingInfo, err error) {
 
-	info := models.WarehousingInfo{}
-	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1 and storehouse_id=? and org_id = ?  and stock_count > 0", goodid, storehouse_id, user_org_id).Order("ctime").First(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and status = 1 and storehouse_id=? and org_id = ?  and stock_count > 0", goodid, storehouse_id, user_org_id).Order("ctime").First(&info).Error
 	return info, err
 }
 
@@ -6917,7 +6917,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId, "good_code": info.GoodCode}).Error
 	return err
 }
 
@@ -8032,7 +8032,7 @@ func FindLastWarehousing(order string) (info models.Warehousing, err error) {
 
 func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice, "register_number": info.RegisterNumber, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice, "register_number": info.RegisterNumber, "storehouse_id": info.StorehouseId, "good_code": info.GoodCode}).Error
 	return err
 }