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 = 10587 //机构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 = 10587 //机构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 = 10587 //机构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 = 10587 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 16787 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/device_api_controller.go

@@ -778,6 +778,7 @@ func (this *DeviceAPIController) CreateNumber() {
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
 	sort, _ := this.GetInt64("sort")
+	number_type := this.GetString("number_type")
 	if len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -806,20 +807,21 @@ func (this *DeviceAPIController) CreateNumber() {
 
 	_, errcode := service.GetCreateDeviceNumber(num, adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
-		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID, sort)
+		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID, sort, number_type)
 		if createErr != nil {
 			this.ErrorLog("创建机号失败:%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 			return
 		}
 		numberJson := map[string]interface{}{
-			"id":         number.ID,
-			"number":     number.Number,
-			"zone_id":    number.ZoneID,
-			"group_id":   number.GroupID,
-			"zone_name":  zone.Name,
-			"group_name": group.Name,
-			"sort":       number.Sort,
+			"id":          number.ID,
+			"number":      number.Number,
+			"zone_id":     number.ZoneID,
+			"group_id":    number.GroupID,
+			"zone_name":   zone.Name,
+			"group_name":  group.Name,
+			"sort":        number.Sort,
+			"number_type": number.NumberType,
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"number": numberJson,
@@ -842,6 +844,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
 	sort, _ := this.GetInt64("sort")
+	number_type := this.GetString("number_type")
 	if id <= 0 || len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -882,6 +885,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	number.ZoneID = zoneID
 	number.GroupID = groupID
 	number.Sort = sort
+	number.NumberType = number_type
 	byName, _ := service.GetDeviceNumberByName(num, zoneID, adminInfo.CurrentOrgId)
 	if byName.ID > 0 && byName.ID != id {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -906,13 +910,14 @@ func (this *DeviceAPIController) ModifyNumber() {
 	}
 
 	numberJson := map[string]interface{}{
-		"id":         number.ID,
-		"number":     number.Number,
-		"zone_id":    number.ZoneID,
-		"group_id":   number.GroupID,
-		"zone_name":  zone.Name,
-		"group_name": group.Name,
-		"sort":       number.Sort,
+		"id":          number.ID,
+		"number":      number.Number,
+		"zone_id":     number.ZoneID,
+		"group_id":    number.GroupID,
+		"zone_name":   zone.Name,
+		"group_name":  group.Name,
+		"sort":        number.Sort,
+		"number_type": number.NumberType,
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"number": numberJson,

controllers/dialysis_api_controller.go

@@ -4577,6 +4577,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	patientDiagnose, _ := service.FindPatientDianose(adminUserInfo.CurrentOrgId)
 
 	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -4635,6 +4637,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
 			"lastSchedule":              lastSchedule,
+			"numberList":                numberList,
 		})
 
 	}
@@ -4675,6 +4678,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"prescriptionInfo":          prescriptionInfo,
 			"patientDiagnose":           patientDiagnose,
 			"lastSchedule":              lastSchedule,
+			"numberList":                numberList,
 		})
 	}
 

controllers/his_api_controller.go

@@ -3816,6 +3816,9 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
+											//fmt.Println("p----------------------------------------------------", p.ProjectId)
+											//fmt.Println("p----------------------------------------------------", nowCount)
+											//fmt.Println("p----------------------------------------------------", historyCount)
 											//如果当前处方数量大于历史数据,则需要出库
 											if nowCount > historyCount {
 
@@ -3965,18 +3968,41 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 											}
 
-											//lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
-											////查询历史出库数据
-											//flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
-											//
-											//var out_count_five int64
-											//for _, item := range flowGood {
-											//	out_count_five += item.Count
-											//}
-											//parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
-											//
-											////如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
-											//if out_count_five != parseIntCount {
+											lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
+											//查询历史出库数据
+											flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+
+											var out_count_five int64
+											for _, item := range flowGood {
+												out_count_five += item.Count
+											}
+											parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
+
+											//fmt.Println("p.ProjectId-----------------", p.ProjectId)
+											//fmt.Println("out_count_five===============", out_count_five)
+											//fmt.Println("parseIntCount===============", parseIntCount)
+											//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
+											if out_count_five != parseIntCount {
+												service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+												detail := models.AutomaticReduceDetail{
+													WarehouseOutId:          0,
+													WarehouseOutOrderNumber: "",
+													PatientId:               p.PatientId,
+													Ctime:                   time.Now().Unix(),
+													Mtime:                   0,
+													Status:                  1,
+													RecordTime:              p.RecordDate,
+													OrgId:                   p.UserOrgId,
+													GoodId:                  p.ProjectId,
+													GoodTypeId:              0,
+													Count:                   parseIntCount,
+													Type:                    0,
+													ProjectId:               lastHisProject.ID,
+													StorehouseId:            0,
+												}
+
+												service.CreateNewAutoDetail(detail, tx)
+											}
 											//	//查询耗材最后一次出库记录
 											//	wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
 											//	//查询默认出库仓库库存

controllers/mobile_api_controllers/patient_api_controller.go

@@ -300,7 +300,10 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	advice.UpdatedTime = time.Now().Unix()
 	advice.UserOrgId = adminUserInfo.Org.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+	if adminUserInfo.Org.Id == 10580 {
+		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+	}
+
 	//处理修改医嘱开始时间逻辑(不包括子医嘱)
 	//1.一组医嘱内只有一条医嘱(不包括子医嘱)的情况下，只需要直接修改医嘱开始时间，不需要重新分配组号
 	//2.一组医嘱内有多条医嘱(不包括子医嘱)的情况下,需要为修改的那条医嘱重新分配组号，并修改医嘱开始时间
@@ -5685,6 +5688,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
 	lastWeight, _ := service.MobileGetLast(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	numberList, _ := service.GetAllBedNumberList(adminUserInfo.Org.Id)
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,
@@ -5708,6 +5712,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"lastSchedule":            lastSchedule,
 			"DoctorAdvice":            DoctorAdvice,
 			"hisAdvice":               hisAdvice,
+			"numberList":              numberList,
 		})
 	}
 
@@ -5734,6 +5739,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"lastSchedule":            lastSchedule,
 			"DoctorAdvice":            DoctorAdvice,
 			"hisAdvice":               hisAdvice,
+			"numberList":              numberList,
 		})
 	}
 

controllers/patient_dataconfig_api_controller.go

@@ -158,15 +158,15 @@ func (this *PatientDataConfigAPIController) GetSickHistorys() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, _ := service.GetPatientByIDOne(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	records, getRecordsErr := service.GetPatientSickHistory(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
 	if getRecordsErr != nil {
@@ -198,10 +198,10 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	if patientID <= 0 || len(content) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if patientID <= 0 || len(content) == 0 {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	if len(record_time_str) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -213,15 +213,15 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientSickHistory{
@@ -371,15 +371,15 @@ func (this *PatientDataConfigAPIController) GetPhysiqueChecks() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	records, getRecordsErr := service.GetPatientPhysiqueCheck(adminUserInfo.CurrentOrgId, patientID, startTime.Unix(), endTime.Unix())
 	if getRecordsErr != nil {
@@ -479,15 +479,15 @@ func (this *PatientDataConfigAPIController) CreatePhysiqueCheck() {
 	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientPhysiqueCheck{
@@ -673,15 +673,15 @@ func (this *PatientDataConfigAPIController) ModifyPhysiqueCheck() {
 
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 	now := time.Now().Unix()
 
 	record := models.XtPatientPhysiqueCheck{

controllers/print_data_api_controller.go

@@ -135,12 +135,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
+		numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedules":      schedules,
 			"medical_staffs": medicalStaffs,
 			"users":          adminUser,
 			"templateInfo":   templateInfo,
 			"name":           name,
+			"numberList":     numberList,
 		})
 	}
 
@@ -217,13 +219,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
-
+		numberList, _ := service.GetAllBedNumberList(adminUserInfo.CurrentOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedules":      schedules,
 			"medical_staffs": medicalStaffs,
 			"users":          adminUser,
 			"templateInfo":   templateInfo,
 			"name":           name,
+			"numberList":     numberList,
 		})
 	}
 

controllers/schedule_api_controller.go

@@ -4548,6 +4548,10 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
 			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
+			templateList, _ := service.GetHisPrescriptionTemplateList(orgId, item.PatientId, item.ModeId)
+
+			item.HisPrescriptionTemplate = templateList
+
 		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4583,6 +4587,10 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 			assessmentBeforFourty, _ := service.GetAssessmentBeforFourty(orgId, item.PatientId, item.ScheduleDate)
 			item.XtAssessmentBeforeDislysis = assessmentBeforFourty
 
+			templateList, _ := service.GetHisPrescriptionTemplateList(orgId, item.PatientId, item.ModeId)
+
+			item.HisPrescriptionTemplate = templateList
+
 		}
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/stock_in_api_controller.go

@@ -5060,10 +5060,14 @@ func (this *StockManagerApiController) GetCancelStockOrderPrint() {
 func (this *StockManagerApiController) GetStockBatchNumber() {
 
 	id, _ := this.GetInt64("id")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetStockBatchNumber(id, orgId)
+	lastWarehouseInfoTwo, _ := service.GetLastWarehouseInfoTwo(id, storehouse_id, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":                 list,
+		"lastWarehouseInfoTwo": lastWarehouseInfoTwo,
 	})
 }
 

models/device_models.go

@@ -245,6 +245,7 @@ type DeviceNumber struct {
 	CreateTime int64      `gorm:"column:ctime" json:"-"`
 	ModifyTime int64      `gorm:"column:mtime" json:"-"`
 	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	NumberType string     `gorm:"column:number_type" json:"number_type" form:"number_type"`
 	DeviceZone DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
 }
 

models/schedule_models.go

@@ -296,6 +296,7 @@ type VmSchedulesRemind struct {
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisPrescriptionTemplate    HisPrescriptionTemplateSix `json:"his_prescription_template" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -579,6 +580,7 @@ type GoodInfoNight struct {
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 func (GoodInfoNight) TableName() string {

service/device_service.go

@@ -393,13 +393,14 @@ func UpdateDeviceGroup(group *models.DeviceGroup) error {
 //////// 机号 Number
 
 type DeviceNumberVM struct {
-	ID      int64  `gorm:"column:id" json:"id"`
-	OrgID   int64  `gorm:"column:org_id" json:"-"`
-	Number  string `gorm:"column:number" json:"number"`
-	ZoneID  int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status  int64  `gorm:"column:status" json:"status" form:"status"`
-	Sort    int64  `gorm:"column:sort" json:"sort" form:"sort"`
-	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Number     string `gorm:"column:number" json:"number"`
+	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	GroupId    int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	NumberType string `gorm:"column:number_type" json:"number_type" form:"number_type"`
 }
 
 func (DeviceNumberVM) TableName() string {
@@ -487,7 +488,7 @@ func GetCreateDeviceNumber(num string, orgid int64) (*models.DeviceNumber, error
 	return &number, nil
 }
 
-func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64, sort int64) (*models.DeviceNumber, error) {
+func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64, sort int64, number_type string) (*models.DeviceNumber, error) {
 	now := time.Now().Unix()
 	numberModel := models.DeviceNumber{
 		OrgID:      orgID,
@@ -498,6 +499,7 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64,
 		CreateTime: now,
 		ModifyTime: now,
 		Sort:       sort,
+		NumberType: number_type,
 	}
 	err := writeDb.Model(&models.DeviceNumber{}).Create(&numberModel).Error
 	if err != nil {

service/dialysis_solution_service.go

@@ -103,11 +103,17 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status=1 and solution_status =1 and user_org_id=?", orgID).
+			Preload("DialysisPrescription", "status=1 and record_date = ?  and user_org_id=?", scheduleDate, orgID).
+			Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status=1 and solution_status =1 and user_org_id=?", orgID).
+			Preload("DialysisPrescription", "status=1 and record_date = ?  and user_org_id=?", scheduleDate, orgID).
+			Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	}
 
 	return schedule, total, err

service/mobile_dialysis_service.go

@@ -3261,6 +3261,18 @@ func GetAssessmentBeforFourty(orgid int64, patientid int64, recorddate int64) (m
 	return evaluation, err
 }
 
+func GetHisPrescriptionTemplateList(user_org_id int64, patient_id int64, mode_id int64) (models.HisPrescriptionTemplateSix, error) {
+
+	templateSix := models.HisPrescriptionTemplateSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode = ? and status =1", user_org_id, patient_id, mode_id).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? and type =2", user_org_id).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ? and type =3", user_org_id).Preload("GoodInfo", "org_id = ? and status=1 ", user_org_id)
+		})
+	}).Find(&templateSix).Error
+
+	return templateSix, err
+}
+
 func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -1,11 +1,12 @@
 package schedule_dialysis
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/models"
 	p_service "XT_New/service"
 	"XT_New/utils"
-	"fmt"
-	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -111,6 +112,12 @@ func GetAllAdminUsers(orgId int64, appid int64) (list []*AdminUserList, err erro
 	return
 }
 
+func GetAllBedNumberList(orgid int64) (number []*models.DeviceNumber, err error) {
+	db := p_service.XTReadDB()
+	err = db.Where("org_id =? and status =1", orgid).Find(&number).Error
+	return number, err
+}
+
 func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 	db := p_service.UserReadDB()
 	err = db.Table("sgj_user_admin_role as uar").Joins("left join sgj_user_admin as ua on ua.id = uar.admin_user_id").Joins("left join sgj_user_admin_electronic_signature  as e on e.creator = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1 and e.status = 1 and e.org_id = ? and e.app_id = ?", orgId, appid, orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,e.url").Scan(&list).Error

service/stock_service.go

@@ -6208,6 +6208,13 @@ func GetLastWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func GetLastWarehouseInfoTwo(goodid int64, storehouse_id int64, user_org_id int64) (models.WarehousingInfo, 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
+	return info, err
+}
+
 func GetFirstWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
 	info := models.WarehousingInfo{}
 	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodid).First(&info).Error
@@ -8203,7 +8210,7 @@ func AddDrugReturnWarehouseStockMinNumber(count int64, id int64) error {
 
 func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "retail_price": info.RetailPrice, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "drug_code": info.DrugCode}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "retail_price": info.RetailPrice, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "drug_code": info.DrugCode, "batch_number": info.BatchNumber}).Error
 	return err
 }