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

controllers/common_api_controller.go

@@ -177,6 +177,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	major, _ := service.GetInspectionMajor(orgid)
+	fmt.Println("major22222222222222222222222222222222222222", major)
 	if len(major) == 0 {
 		configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
 		pressure, err := service.GetDefaultBloodPressure(orgid)

controllers/drug_stock_api_contorller.go

@@ -3463,9 +3463,13 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 1 {
 		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId)
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
+		dealerList, _ := service.GetAllDealerList(orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"list": list,
+				"list":             list,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 			return
 		}
@@ -3502,11 +3506,15 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	}
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+	dealerList, _ := service.GetAllDealerList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if order_type == 2 {
 		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"list": list,
+				"list":             list,
+				"dealerList":       dealerList,
+				"manufacturerList": manufacturerList,
 			})
 			return
 		}

controllers/gobal_config_api_controller.go

@@ -1891,16 +1891,20 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":        order,
-		"total":        total,
-		"orderPrint":   orderPrint,
-		"drugTypeList": drugTypeList,
-		"houseList":    houseList,
+		"order":            order,
+		"total":            total,
+		"orderPrint":       orderPrint,
+		"drugTypeList":     drugTypeList,
+		"houseList":        houseList,
+		"dealerList":       dealerList,
+		"manufacturerList": manufacturerList,
 	})
 }
 

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/mobile_api_controllers/dialysis_api_controller.go

@@ -118,6 +118,8 @@ func (this *DialysisAPIController) Scheduals() {
 
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
+
+				//monitor, _ := service.GetMonitorByListSix(orgID, date.Unix())
 				for key, item := range scheduals {
 
 					for _, infor := range inforMation {
@@ -204,6 +206,14 @@ func (this *DialysisAPIController) Scheduals() {
 							break
 						}
 					}
+
+					////	监测
+					//scheduals[key].VMMonitoringRecord = make([]models.VMMonitoringRecord, 0)
+					//for _, moni := range monitor {
+					//	if item.PatientId == moni.PatientId {
+					//		scheduals[key].VMMonitoringRecord = append(scheduals[key].VMMonitoringRecord, moni)
+					//	}
+					//}
 				}
 				//缓存数据
 				scheduals_json, err := json.Marshal(&scheduals)
@@ -9362,3 +9372,294 @@ func (this *DialysisAPIController) CheckMobileInformation() {
 	}
 
 }
+
+func (c *DialysisAPIController) GetControlMonitorList() {
+
+	partition, _ := c.GetInt64("partition")
+	monitorDate := c.GetString("date")
+	patient_id, _ := c.GetInt64("patient_id")
+	pat_type, _ := c.GetInt64("pat_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTime int64
+	if len(monitorDate) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", monitorDate+" 00:00:00", loc)
+		if err != nil {
+			theStartTime = 0
+		}
+		theStartTime = theTime.Unix()
+	}
+	adminInfo := c.GetMobileAdminUserInfo()
+	orgID := adminInfo.Org.Id
+	monitor, err := service.GetNewMonitorRecord(orgID, theStartTime, partition, patient_id)
+
+	if err != nil {
+		c.ErrorLog("获取排班信息失败:%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		if len(monitor) > 0 {
+			//获取所有床位
+			numberList, _ := service.GetAllDeviceNumberByList(orgID)
+			//获取所有分区
+			zoneList, _ := service.GetAllZoneByList(orgID)
+			//获取透析处方
+			prescriptions, _ := service.GetAllPrescriptionByListSix(orgID, theStartTime)
+			//获取透前评估
+			assessmentBefores, _ := service.GetAllAssessmentBeforesByListOne(orgID, theStartTime)
+			//获取上机
+			dialysisOrders, _ := service.GetAllDialysisOrdersByListNight(orgID, theStartTime, pat_type)
+			//获取透后
+			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListSix(orgID, theStartTime)
+
+			//获取透后监测
+			monitorlist, _ := service.GetNewAllMonitorList(orgID, theStartTime, pat_type)
+
+			//获取所有的患者
+			patients, _ := service.GetAllPatientListByListOne(orgID)
+
+			//获取所有透析模式
+			treatments, _ := service.GetAllTreatModeByList(orgID)
+
+			//获取所有医嘱
+			adviceList, _ := service.GetAdviceList(orgID, theStartTime, pat_type)
+
+			//获取双人核对
+			checkList, _ := service.GetDobuleCheck(orgID, theStartTime)
+
+			//治疗小结
+			summaryList, _ := service.GetTreatmentSummaryForList(orgID, theStartTime)
+
+			//待消毒
+			informationList, _ := service.GetDialysisInformationList(orgID, theStartTime)
+
+			for key, item := range monitor {
+				// 获取床位信息
+				for _, it := range numberList {
+					if item.BedId == it.ID {
+						monitor[key].DeviceNumber = it
+						break
+					}
+				}
+
+				//获取分区信息
+				for _, it := range zoneList {
+					if item.PartitionId == it.ID {
+						monitor[key].DeviceZone = it
+					}
+				}
+
+				for _, prescription := range prescriptions {
+					if item.PatientId == prescription.PatientId {
+						monitor[key].Prescription = prescription
+						break
+					}
+				}
+
+				for _, it := range checkList {
+					if item.PatientId == it.PatientId {
+						monitor[key].DoubleCheck = it
+						break
+					}
+				}
+
+				for _, it := range summaryList {
+					if item.PatientId == it.PatientId {
+						monitor[key].TreatmentSummaryForList = it
+						break
+					}
+				}
+
+				// 透前评估
+				for _, assessmentBefore := range assessmentBefores {
+					if item.PatientId == assessmentBefore.PatientId {
+						monitor[key].AssessmentBeforeDislysis = assessmentBefore
+						break
+					}
+				}
+
+				// 透析上下机
+				for _, dialysisOrder := range dialysisOrders {
+					if item.PatientId == dialysisOrder.PatientId {
+						monitor[key].DialysisOrder = dialysisOrder
+						break
+					}
+				}
+
+				// 治疗小节
+				for _, afterDislysis := range AssessmentAfterDislysis {
+					if item.PatientId == afterDislysis.PatientId {
+						monitor[key].AssessmentAfterDislysis = afterDislysis
+						break
+					}
+				}
+
+				for _, it := range monitorlist {
+					if item.PatientId == it.PatientId {
+						monitor[key].MonitoringRecord = append(monitor[key].MonitoringRecord, it)
+					}
+				}
+
+				for _, it := range adviceList {
+					if item.PatientId == it.PatientId {
+						monitor[key].AdviceList = append(monitor[key].AdviceList, it)
+					}
+				}
+
+				for _, patient := range patients {
+					if item.PatientId == patient.ID {
+						monitor[key].MonitorPatients = patient
+						break
+					}
+				}
+
+				for _, treatment := range treatments {
+					if item.ModeId == treatment.ID {
+						monitor[key].TreatmentMode = treatment
+						break
+					}
+				}
+
+				for _, infor := range informationList {
+					if item.PatientId == infor.PatientId {
+						monitor[key].NewDeviceInformation = infor
+						break
+					}
+				}
+			}
+		}
+
+	}
+
+	patients, err := service.GetAllpatientFourty(orgID)
+
+	var mds []*models.NewMonitorDialysisScheduleList
+
+	if pat_type == 0 {
+		for _, item := range monitor {
+			mds = append(mds, item)
+		}
+	}
+
+	//待医嘱核对
+	if pat_type == 1 {
+		for _, item := range monitor {
+			if len(item.AdviceList) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	//待开小结
+	if pat_type == 2 {
+		for _, item := range monitor {
+			if item.TreatmentSummaryForList == nil {
+
+				mds = append(mds, item)
+
+			}
+
+		}
+	}
+	//待下机
+	if pat_type == 3 {
+		for _, item := range monitor {
+			if item.DialysisOrder != nil {
+				if item.DialysisOrder.ID > 0 {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+
+	//待消毒
+	if pat_type == 4 {
+		for _, item := range monitor {
+			if item.NewDeviceInformation == nil {
+				mds = append(mds, item)
+			}
+
+		}
+	}
+	//待双人核对
+	if pat_type == 5 {
+		for _, item := range monitor {
+			if item.DoubleCheck == nil {
+
+				mds = append(mds, item)
+
+			}
+
+		}
+	}
+
+	//医嘱未执行
+	if pat_type == 6 {
+		for _, item := range monitor {
+			if len(item.AdviceList) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	//患者未签名
+	if pat_type == 7 {
+		for _, item := range monitor {
+			if item.DialysisOrder != nil {
+				if item.DialysisOrder.ID > 0 {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+	//目标超滤于实际超滤不同
+	if pat_type == 8 {
+		for _, item := range monitor {
+			if item.Prescription != nil && item.AssessmentAfterDislysis != nil {
+				if item.Prescription.TargetUltrafiltration != item.AssessmentAfterDislysis.ActualUltrafiltration {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+	//血压少于5次
+	if pat_type == 9 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) < 5 {
+				mds = append(mds, item)
+			}
+		}
+	}
+
+	if pat_type == 10 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) == 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+
+	if pat_type == 11 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	if pat_type == 12 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"monitor":  mds,
+			"patients": patients,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -199,4 +199,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/checkmobileinformation", &DialysisAPIController{}, "Get:CheckMobileInformation")
 
+	beego.Router("/m/api/getcontrolmonitorlist", &DialysisAPIController{}, "Get:GetControlMonitorList")
+
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -875,7 +875,7 @@ func (this *NewCommonApiController) GetMobilePatientControl() {
 func (this *NewCommonApiController) GetMobileCartogramlist() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
-	//lapstor, _ := this.GetInt64("lapstor")
+	lapstor, _ := this.GetInt64("lapstor")
 	//fmt.Println("lapstor", lapstor)
 	startime := this.GetString("startime")
 
@@ -891,9 +891,14 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	//统计总共
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
 
-	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	//_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	//
+	//_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
 
-	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
+	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, 1, 10000)
+	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+
+	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -901,9 +906,10 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":         total,
-		"standtotal":    standtotal,
-		"standtotalOne": standtotalOne,
+		"patients":          patients,
+		"total":             total,
+		"control":           control,
+		"infectiousControl": infectiousControl,
 	})
 }
 

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 {
@@ -773,15 +775,15 @@ func (this *PatientDataConfigAPIController) CreateCourse() {
 	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, _ := 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
+	//}
 
 	now := time.Now().Unix()
 	record := models.PatientDiseaseCourse{
@@ -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/schedule_api_controller.go

@@ -89,6 +89,8 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule/changeschedule", &ScheduleApiController{}, "Put:ChangeScheduleTen")
 
+	beego.Router("/api/schedule/getordernumber", &ScheduleApiController{}, "Get:GetNumberListById")
+
 }
 func (c *ScheduleApiController) CoverSch() {
 	id_one, _ := c.GetInt64("id_one")
@@ -4932,74 +4934,158 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 		return
 	} else {
 
-		//查询该床位今天是否存在排班
-		sch, _ := service.GetScheduleByBedId(bed_id, schedule_type, adminINfo.CurrentOrgId, schedule.ScheduleDate)
-		fmt.Println("schwowowoowowowowowo", sch.ID)
-		if sch.ID == 0 {
-			////删除排班
-			//service.UpdateScheduleByScheduleId(id)
-
-			xtSchedule := models.XtSchedule{
-				UserOrgId:           adminINfo.CurrentOrgId,
-				PartitionId:         number.ZoneID,
-				BedId:               bed_id,
-				PatientId:           schedule.PatientId,
-				ScheduleDate:        schedule.ScheduleDate,
-				ScheduleType:        schedule.ScheduleType,
-				ScheduleWeek:        schedule.ScheduleWeek,
-				ModeId:              mode_id,
-				Status:              1,
-				CreatedTime:         time.Now().Unix(),
-				UpdatedTime:         0,
-				IsExport:            999999,
-				DialysisMachineName: "",
+		//如果床位未发生改变
+		if bed_id == schedule.BedId {
+
+			//查询该床位今天是否存在排班
+			sch, _ := service.GetScheduleByBedId(bed_id, schedule_type, adminINfo.CurrentOrgId, schedule.ScheduleDate)
+			fmt.Println("schwowowoowowowowowo", sch.ID, sch.PatientId)
+
+			if sch.ID == 0 {
+				////删除排班
+				//service.UpdateScheduleByScheduleId(id)
+
+				//五四的床位
+				xtSchedule := models.XtSchedule{
+					UserOrgId:           adminINfo.CurrentOrgId,
+					PartitionId:         number.ZoneID,
+					BedId:               bed_id,
+					PatientId:           schedule.PatientId,
+					ScheduleDate:        schedule.ScheduleDate,
+					ScheduleType:        schedule_type,
+					ScheduleWeek:        schedule.ScheduleWeek,
+					ModeId:              mode_id,
+					Status:              1,
+					CreatedTime:         time.Now().Unix(),
+					UpdatedTime:         0,
+					IsExport:            999999,
+					DialysisMachineName: "",
+				}
+				//service.CreateNewSchedule(xtSchedule)
+
+				service.UpdateScheduleSixTy(id, xtSchedule)
 			}
-			//service.CreateNewSchedule(xtSchedule)
-			service.UpdateScheduleSixTy(id, xtSchedule)
-		}
 
-		//存在排班
-		if sch.ID > 0 {
-			//删除排班
-			//service.UpdateScheduleByScheduleId(id)
-			//查询该患者的透析模式对应的透析器灌流器
-			//service.GetDialysisSolutionByMode(schedule.PatientId)
-
-			fmt.Println("bed_id2oo2o2o22o", bed_id)
-			xtSchedule := models.XtSchedule{
-				UserOrgId:           adminINfo.CurrentOrgId,
-				PartitionId:         number.ZoneID,
-				BedId:               bed_id,
-				PatientId:           schedule.PatientId,
-				ScheduleDate:        schedule.ScheduleDate,
-				ScheduleType:        schedule_type,
-				ScheduleWeek:        schedule.ScheduleWeek,
-				ModeId:              mode_id,
-				Status:              1,
-				CreatedTime:         time.Now().Unix(),
-				UpdatedTime:         time.Now().Unix(),
-				IsExport:            8888,
-				DialysisMachineName: "",
+			if schedule_type != schedule.ScheduleType && sch.ID > 0 {
+				//存在排班
+				if sch.ID > 0 {
+
+					xtSchedule := models.XtSchedule{
+						UserOrgId:           adminINfo.CurrentOrgId,
+						PartitionId:         number.ZoneID,
+						BedId:               sch.BedId,
+						PatientId:           schedule.PatientId,
+						ScheduleDate:        sch.ScheduleDate,
+						ScheduleType:        sch.ScheduleType,
+						ScheduleWeek:        sch.ScheduleWeek,
+						ModeId:              sch.ModeId,
+						Status:              1,
+						CreatedTime:         time.Now().Unix(),
+						UpdatedTime:         time.Now().Unix(),
+						IsExport:            8888,
+						DialysisMachineName: "",
+					}
+					fmt.Println("汪涵我我我哦", id)
+
+					//赵云的ID
+					// 该床位存在的患者
+					service.UpdateScheduleSixTy(id, xtSchedule)
+
+					//赵云的排班
+					msch := models.XtSchedule{
+						UserOrgId:    adminINfo.CurrentOrgId,
+						PartitionId:  schedule.PartitionId,
+						BedId:        schedule.BedId,
+						PatientId:    sch.PatientId,
+						ScheduleDate: schedule.ScheduleDate,
+						ScheduleType: schedule.ScheduleType,
+						ScheduleWeek: schedule.ScheduleWeek,
+						ModeId:       schedule.ModeId,
+						IsExport:     88888,
+						CreatedTime:  time.Now().Unix(),
+						UpdatedTime:  time.Now().Unix(),
+					}
+
+					// 历史床位的患者
+					service.UpdateScheduleSixTy(sch.ID, msch)
+				}
 			}
-			// 旧的id
-			service.UpdateScheduleSixTy(sch.ID, xtSchedule)
-
-			fmt.Println("床位id", sch.BedId)
-			msch := models.XtSchedule{
-				UserOrgId:    adminINfo.CurrentOrgId,
-				PartitionId:  sch.PartitionId,
-				BedId:        sch.BedId,
-				PatientId:    sch.PatientId,
-				ScheduleDate: sch.ScheduleDate,
-				ScheduleType: sch.ScheduleType,
-				ScheduleWeek: sch.ScheduleWeek,
-				ModeId:       sch.ModeId,
-				IsExport:     88888,
-				CreatedTime:  time.Now().Unix(),
-				UpdatedTime:  time.Now().Unix(),
+
+		}
+
+		//如果床位发生改变
+		if bed_id != schedule.BedId {
+			//查询该床位今天是否存在排班
+			sch, _ := service.GetScheduleByBedId(bed_id, schedule_type, adminINfo.CurrentOrgId, schedule.ScheduleDate)
+			fmt.Println("schwowowoowowowowowo", sch.ID, sch.PatientId)
+
+			if sch.ID == 0 {
+				////删除排班
+				//service.UpdateScheduleByScheduleId(id)
+
+				//五四的床位
+				xtSchedule := models.XtSchedule{
+					UserOrgId:           adminINfo.CurrentOrgId,
+					PartitionId:         number.ZoneID,
+					BedId:               bed_id,
+					PatientId:           schedule.PatientId,
+					ScheduleDate:        schedule.ScheduleDate,
+					ScheduleType:        schedule_type,
+					ScheduleWeek:        schedule.ScheduleWeek,
+					ModeId:              mode_id,
+					Status:              1,
+					CreatedTime:         time.Now().Unix(),
+					UpdatedTime:         0,
+					IsExport:            999999,
+					DialysisMachineName: "",
+				}
+				//service.CreateNewSchedule(xtSchedule)
+
+				service.UpdateScheduleSixTy(id, xtSchedule)
 			}
 
-			service.UpdateScheduleSixTy(id, msch)
+			//存在排班
+			if sch.ID > 0 {
+
+				xtSchedule := models.XtSchedule{
+					UserOrgId:           adminINfo.CurrentOrgId,
+					PartitionId:         number.ZoneID,
+					BedId:               sch.BedId,
+					PatientId:           schedule.PatientId,
+					ScheduleDate:        sch.ScheduleDate,
+					ScheduleType:        sch.ScheduleType,
+					ScheduleWeek:        sch.ScheduleWeek,
+					ModeId:              sch.ModeId,
+					Status:              1,
+					CreatedTime:         time.Now().Unix(),
+					UpdatedTime:         time.Now().Unix(),
+					IsExport:            8888,
+					DialysisMachineName: "",
+				}
+				fmt.Println("idwoowowowowowowoowowowowo", id)
+
+				//赵云的ID
+				// 该床位存在的患者
+				service.UpdateScheduleSixTy(id, xtSchedule)
+
+				//赵云的排班
+				msch := models.XtSchedule{
+					UserOrgId:    adminINfo.CurrentOrgId,
+					PartitionId:  schedule.PartitionId,
+					BedId:        schedule.BedId,
+					PatientId:    sch.PatientId,
+					ScheduleDate: schedule.ScheduleDate,
+					ScheduleType: schedule.ScheduleType,
+					ScheduleWeek: schedule.ScheduleWeek,
+					ModeId:       schedule.ModeId,
+					IsExport:     88888,
+					CreatedTime:  time.Now().Unix(),
+					UpdatedTime:  time.Now().Unix(),
+				}
+
+				// 历史床位的患者
+				service.UpdateScheduleSixTy(sch.ID, msch)
+			}
 
 		}
 	}
@@ -5010,3 +5096,14 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 	})
 
 }
+
+func (c *ScheduleApiController) GetNumberListById() {
+
+	id, _ := c.GetInt64("id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	number, _ := service.GetNumberListById(id, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"number": number,
+	})
+
+}

controllers/self_drug_api_congtroller.go

@@ -3498,52 +3498,66 @@ func (this *SelfDrugApiController) GetDrugWarehouseInfoById() {
 func (this *SelfDrugApiController) GetSendGoodInformation() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	//获取入库数据
-	list, _ := service.GetSendGoodInformation(orgId)
+	fmt.Println("orgid", orgId)
+	list, _ := service.GetWarehouseOutInfo(10489)
+
 	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
-		}
+		service.UpdateWarehosueOutInfo(it.ID, it.WarehouseOutTime)
+	}
 
-		//实际出库总数量
-		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range actlist {
-			act_count += item.Count
-		}
+	//获取入库数据
+	//list, _ := service.GetSendGoodInformation(10265)
+	//
+	////project, _ := service.GetHisPrescriptionList(10265)
+	//
+	//for _, it := range list {
+	//	service.UpdateGoodFlow(it.ID, it.PackingPrice)
+	//}
 
-		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 {
+	//	//查询是否有数据
+	//	_, 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 +3924,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)
 		}

controllers/stock_in_api_controller.go

@@ -3170,16 +3170,20 @@ func (this *StockManagerApiController) GetDetailInfo() {
 	var err error
 	var total_price float64
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	if types == 1 {
 		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":        list,
-				"total":       total,
-				"total_price": total_price,
-				"houseList":   houseList,
+				"list":             list,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3190,10 +3194,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 		_, total_price = service.GetStockOutDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":        list1,
-				"total":       total,
-				"total_price": total_price,
-				"houseList":   houseList,
+				"list":             list1,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3203,8 +3209,10 @@ func (this *StockManagerApiController) GetDetailInfo() {
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":  list2,
-				"total": total,
+				"list":             list2,
+				"total":            total,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3214,10 +3222,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":      list3,
-				"total":     total,
-				"listgroup": listGroup,
-				"houseList": houseList,
+				"list":             list3,
+				"total":            total,
+				"listgroup":        listGroup,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/device_models.go

@@ -1488,3 +1488,17 @@ func (XtDialysisRegistration) TableName() string {
 
 	return "xt_dialysis_registration"
 }
+
+type NewDeviceInformation struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	Date      int64 `gorm:"column:date" json:"date" form:"date"`
+	Class     int64 `gorm:"column:class" json:"class" form:"class"`
+	Zone      int64 `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber int64 `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (NewDeviceInformation) TableName() string {
+
+	return "xt_device_information"
+}

models/new_monitor.go

@@ -50,6 +50,7 @@ type VMMonitorDialysisOrder struct {
 	DeviceNumber  DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
 	StartTime     int64        `gorm:"column:start_time" json:"start_time"`
 	DialysisTotal int64        `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
+	Url           string       `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (VMMonitorDialysisOrder) TableName() string {
@@ -117,8 +118,45 @@ type VMMonitoringRecord struct {
 	Status                 int64   `gorm:"column:status" json:"status"`
 	AccumulatedBloodVolume float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 	UltrafiltrationVolume  float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
+	VenousPressure         float64 `gorm:"column:venous_pressure" json:"venous_pressure" form:"venous_pressure"`
+	ArterialPressure       float64 `gorm:"column:arterial_pressure" json:"arterial_pressure" form:"arterial_pressure"`
+	BloodOxygenSaturation  string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Symptom                string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
+	Dispose                string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
+	Result                 string  `gorm:"column:result" json:"result" form:"result"`
 }
 
 func (VMMonitoringRecord) TableName() string {
 	return "xt_monitoring_record"
 }
+
+type NewMonitorDialysisScheduleList struct {
+	ID           int64 `gorm:"column:id" json:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status"`
+
+	MonitorPatients *VMMonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    *DeviceNumber      `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      *DeviceZone        `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   *TreatmentMode     `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+
+	DialysisOrder            *VMMonitorDialysisOrder    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	Prescription             *VMDialysisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *VMPredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  *VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
+	MonitoringRecord         []*VMMonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	AdviceList               []*VMDoctorAdviceForList   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"advice"`
+	DoubleCheck              *VmDoubleCheck             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dobuleCheck"`
+	TreatmentSummaryForList  *VMTreatmentSummaryForList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatmentSummary"`
+	NewDeviceInformation     *NewDeviceInformation      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatmentSummary"`
+}
+
+func (NewMonitorDialysisScheduleList) TableName() string {
+	return "xt_schedule"
+}

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,37 @@ 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"
+}
+
+type VmDoubleCheck struct {
+	ID             int64 `gorm:"column:id" json:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id"`
+	CheckDate      int64 `gorm:"column:check_date" json:"check_date"`
+	Status         int64 `gorm:"column:status" json:"status"`
+	Creater        int64 `gorm:"column:creater" json:"creater"`
+	Modifier       int64 `gorm:"column:modifier" json:"modifier"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time"`
+	FirstCheckTime int64 `gorm:"column:first_check_time" json:"first_check_time"`
+}
+
+func (VmDoubleCheck) TableName() string {
+	return "xt_double_check"
+}

service/common_service.go

@@ -83,8 +83,8 @@ func GetConfigurationListTwo(orgid int64, limit int64, page int64) (standard []*
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").Count(&total).
-		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Offset(offset).Limit(limit).Scan(&standard).Error
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").
+		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
 

service/drug_stock_service.go

@@ -206,7 +206,7 @@ func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number,x.dealer,x.manufacturer").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
 
 	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error
 	return info, err

service/gobal_config_service.go

@@ -428,9 +428,9 @@ func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderTy
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	}
 
 	return info, err
@@ -466,9 +466,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err

service/manage_service.go

@@ -768,7 +768,7 @@ func QueryInfo(bed int64, start int64, end int64, orgId int64, limit int64, page
 	}
 	offset := (page - 1) * limit
 
-	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Order("x.ctime desc").Offset(offset).Limit(limit).Scan(&infor).Error
+	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Order("x.date desc").Offset(offset).Limit(limit).Scan(&infor).Error
 	if err != nil {
 
 		return
@@ -1809,7 +1809,7 @@ func GetRegistGoodInforList(user_org_id int64) (good []*models.GoodInformationFo
 
 func GetRegistNumber(sys_record_time int64, good_id int64, user_org_id int64) (infor []*models.WarehouseOutInfoNight, err error) {
 
-	err = XTReadDB().Where("sys_record_time = ? and good_id = ? and org_id = ? and status =1", sys_record_time, good_id, user_org_id).Find(&infor).Error
+	err = XTReadDB().Where("sys_record_time = ? and good_id = ? and org_id = ? and status =1 and is_sys=1", sys_record_time, good_id, user_org_id).Find(&infor).Error
 
 	return infor, err
 }

service/mobile_dialysis_service.go

@@ -159,6 +159,7 @@ type MDialysisScheduleVMForList struct {
 	DialysisSolution         *models.DialysisSolution          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 	DoubleCheck              *models.DoubleCheck               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dobule_check"`
 	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
+	//VMMonitoringRecord       []models.VMMonitoringRecord       `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitor_record"`
 }
 
 func (MDialysisScheduleVMForList) TableName() string {
@@ -275,13 +276,11 @@ func (MSchedualPatientVM) TableName() string {
 }
 
 type MDialysisOrderVM struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
-	Stage int64 `gorm:"column:stage" json:"stage"`
-	// Remark         string `gorm:"column:remark" json:"remark"`
+	ID                 int64                      `gorm:"column:id" json:"id"`
+	DialysisDate       int64                      `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId          int64                      `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId          int64                      `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64                      `gorm:"column:stage" json:"stage"`
 	BedID              int64                      `gorm:"column:bed_id" json:"bed_id"`
 	StartNurse         int64                      `gorm:"column:start_nurse" json:"start_nurse"`
 	FinishNurse        int64                      `gorm:"column:finish_nurse" json:"finish_nurse"`

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
@@ -556,3 +571,19 @@ func AddCountFlowOne(warehouse_info_id int64, good_id int64, user_org_id int64,
 	err = XTWriteDB().Model(&stockFlow).Where("warehousing_detail_id = ? and good_id = ? and user_org_id = ? and patient_id = ? AND consumable_type = 7 and system_time = ?").Update(map[string]interface{}{"over_count": over_count}).Error
 	return err
 }
+
+func GetWarehouseOutInfo(user_org_id int64) (info []*models.WarehouseOut, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1", 10489).Find(&info).Error
+
+	return info, err
+}
+
+func UpdateWarehosueOutInfo(id int64, sys_record_time int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err := XTWriteDB().Model(&info).Where("warehouse_out_id = ? and org_id = ? ", id, 10489).Updates(map[string]interface{}{"sys_record_time": sys_record_time, "ctime": sys_record_time}).Error
+
+	return info, err
+}

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

@@ -153,6 +153,12 @@ func GetAllDevicetByListSix(orgID int64) (devices []*models.MDeviceNumberForList
 	return devices, err
 }
 
+func GetMonitorByListSix(orgID int64, monitor_date int64) (monitor []models.VMMonitoringRecord, err error) {
+
+	err = readDb.Where("user_org_id = ? and monitor_date = ? and status =1", orgID, monitor_date).Find(&monitor).Error
+	return monitor, err
+}
+
 func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -760,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
@@ -874,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
 }
 
@@ -2429,9 +2442,21 @@ func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
 	}
 }
 
-func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+func GetAllDialysisOrdersByListNight(orgID int64, scheduleDate int64, pay_tyep int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
+
+	if pay_tyep == 0 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
+	//待下机
+	if pay_tyep == 3 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ? and end_time = 0", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
+
+	fmt.Println("pay_typeowowowoowwo", pay_tyep)
+	if pay_tyep == 7 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?'", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?  and url = ''", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
 
-	err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 	return dialysisOrders, err
 }
 
@@ -2538,6 +2563,13 @@ func GetAllDialysisOrdersByListSix(orgID int64, scheduleDate int64) (dialysisOrd
 	return dialysisOrders, err
 }
 
+func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+
+	err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+
+	return dialysisOrders, err
+}
+
 func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
 	redis := RedisClient()
 
@@ -2938,3 +2970,85 @@ 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
+}
+
+func GetNewMonitorRecord(orgID int64, date int64, partition int64, patientId int64) ([]*models.NewMonitorDialysisScheduleList, error) {
+	var mds []*models.NewMonitorDialysisScheduleList
+
+	db := readDb.Model(&models.NewMonitorDialysisScheduleList{})
+	if date > 0 {
+		db = db.Where("schedule_date = ?", date)
+	}
+	if partition > 0 {
+		db = db.Where("partition_id = ?", partition)
+	}
+	if patientId > 0 {
+
+		db = db.Where("patient_id = ?", patientId)
+	}
+
+	err = db.Where("status = 1 and user_org_id = ?", orgID).Find(&mds).Error
+
+	return mds, err
+}
+
+func GetAdviceList(user_org_id int64, advice_date int64, pat_type int64) (advice []*models.VMDoctorAdviceForList, err error) {
+
+	if pat_type == 0 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =7 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+	}
+	//待医嘱核对
+	if pat_type == 1 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+	}
+	//待医嘱执行
+	if pat_type == 6 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and execution_state = 2", user_org_id, advice_date).Find(&advice).Error
+
+	}
+	return advice, err
+}
+
+func GetDobuleCheck(user_org_id int64, advice_date int64) (check []*models.VmDoubleCheck, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and check_date = ? and status = 1", user_org_id, advice_date).Find(&check).Error
+	return check, err
+}
+
+func GetTreatmentSummaryForList(user_org_id int64, advice_date int64) (summary []*models.VMTreatmentSummaryForList, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and assessment_date = ? and status =1", user_org_id, advice_date).Find(&summary).Error
+
+	return summary, err
+}
+
+func GetDialysisInformationList(user_org_id int64, advice_date int64) (information []*models.NewDeviceInformation, err error) {
+
+	err = UserReadDB().Where("user_org_id =? and date = ? and status =1", user_org_id, advice_date).Find(&information).Error
+	return information, err
+}
+
+func GetNewAllMonitorList(orgID int64, scheduleDate int64, pat_type int64) (monitor []*models.VMMonitoringRecord, err error) {
+	if pat_type == 0 || pat_type == 9 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 10 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND accumulated_blood_volume = 0", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 11 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND symptom <> ''", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 12 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND dispose <> ''", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+	return monitor, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -312,7 +312,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.sys_record_time<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, err
 }
 

service/schedule_service.go

@@ -1718,3 +1718,10 @@ func CreateNewSchedule(schedule models.XtSchedule) error {
 
 	return err
 }
+
+func GetNumberListById(id int64, org_id int64) (number []*models.DeviceNumber, err error) {
+
+	err = XTReadDB().Where("zone_id = ? and org_id = ? and status= 1", id, org_id).Find(&number).Error
+
+	return number, err
+}

service/self_drug_service.go

@@ -1115,7 +1115,7 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.ctime,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.ctime,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&list).Error
 	return list, total, err
 }