历史排班

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10489 //机构id 10344
+		subscibe.OrgId = 10480 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10489 //机构id小英10344或4
+		subscibe.OrgId = 10480 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/common_api_controller.go

 	mode_id, _ := this.GetInt64("mode_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println("start_time", start_time)
-	fmt.Println("end_time", end_time)
-	fmt.Println("mode_id", mode_id)
 
 	modeCount, err := service.GetCountModeId(start_time, end_time, mode_id, orgId)
 	if err != nil {
 	//cfydb_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 6)  //c反应蛋白
 	//
 }
+
+func (this *CommonApiController) GetPatientInspectionList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetAllPatientListMap(orgId)
+	if len(list) > 0 {
+		for _, item := range list {
+			befor, _ := service.GetLastBefor(item.ID)
+			item.BeforSystolicBloodPressure = befor.SystolicBloodPressure
+			item.BeforDiastolicBloodPressure = befor.DiastolicBloodPressure
+
+			after, _ := service.GetLastRecordAfter(item.ID)
+			item.AfterSystolicBloodPressure = after.SystolicBloodPressure
+			item.AfterDiastolicBloodPressure = after.DiastolicBloodPressure
+			item.KTV = after.Ktv
+			item.URR = after.Urr
+
+			list, _ := service.GetInspectionByPatientId(item.ID, 169)
+			item.XueLin = list.InspectValue
+			listOne, _ := service.GetInspectionByPatientId(item.ID, 17)
+			item.XueHongDanBai = listOne.InspectValue
+			listTwo, _ := service.GetInspectionByPatientId(item.ID, 54)
+			item.XueHongDanBai = listTwo.InspectValue
+
+			listThree, _ := service.GetInspectionByPatientId(item.ID, 111215)
+			item.JiaoZhengGai = listThree.InspectValue
+
+			listFour, _ := service.GetInspectionByPatientId(item.ID, 170)
+			item.JiaPanSu = listFour.InspectValue
+
+			listFive, _ := service.GetInspectionByPatientId(item.ID, 176)
+			item.YiTieDanBai = listFive.InspectValue
+
+			listSix, _ := service.GetInspectionByPatientId(item.ID, 1506)
+			item.TieDanBai = listSix.InspectValue
+
+			listSeven, _ := service.GetInspectionByPatientId(item.ID, 183)
+			item.TieDanBai = listSeven.InspectValue
+
+			listEight, _ := service.GetInspectionByPatientId(item.ID, 182)
+			item.Crp = listEight.InspectValue
+
+			listNight, _ := service.GetInspectionByPatientId(item.ID, 42)
+			item.Mg = listNight.InspectValue
+
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/common_api_router.go

 
 	beego.Router("/com/api/getcheckexamine", &CommonApiController{}, "Get:GetCheckExamine")
 
+	beego.Router("/com/api/getpatientinspectionlist", &CommonApiController{}, "Get:GetPatientInspectionList")
+
 }

controllers/dialysis_api_controller.go

 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 
-	longHisAdviceList, _ := service.GetAllHisAdviceTemplateList(orgId)
-
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 
 	drugList, _ := service.GetAllBaseDrugListTwenty(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":              list,
-			"total":             total,
-			"adviceList":        adviceList,
-			"config":            config,
-			"drugList":          drugList,
-			"tablelist":         tablelist,
-			"longHisAdviceList": longHisAdviceList,
+			"list":       list,
+			"total":      total,
+			"adviceList": adviceList,
+			"config":     config,
+			"drugList":   drugList,
+			"tablelist":  tablelist,
 		})
 		return
 

controllers/mobile_api_controllers/dialysis_api_controller.go

 	//	})
 	//	return
 	//}
-	if org_id == 9538 || org_id == 10101 || org_id == 10353 {
+	if org_id == 9538 || org_id == 10101 || org_id == 10353 || org_id == 9946 {
 		list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list": list,

controllers/mobile_api_controllers/patient_api_controller.go

 
 			for _, item := range advices {
 				//恒泰中医院
-				if item.UserOrgId == 10490 {
+				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
 						//从字典里面查找
 						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
 				//恒泰中医院
-				if item.UserOrgId == 10490 {
+				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
 						//从字典里面查找
 						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
 		})
 		return
 	} else if origin == 2 {
-		fmt.Println("缉拿咯喔我我哦我我")
+
 		adminInfo := c.GetMobileAdminUserInfo()
 		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		var ids []string
 						drug_count += its.Count
 					}
 				}
+
 				if total_count == drug_count {
 
 					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
 				}
 
 				//
-				fmt.Println("config.IsOpen", config.IsOpen)
-				fmt.Println("config.IsOpen", item.UserOrgId)
-				if config.IsOpen == 1 && item.UserOrgId == 10375 {
+				if config.IsOpen == 1 && item.UserOrgId == 10210 {
 
 					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 					//更新字典里面的库存

controllers/self_drug_api_congtroller.go

 
 	drug_id, _ := this.GetInt64("drug_id")
 
-	list, _ := service.GetDrugFlowDetailById(drug_id)
-
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetDrugFlowDetailById(drug_id, orgId)
+	fmt.Println("list====================", list)
 	drugMedical, _ := service.GetBaseDrugMedical(drug_id)
 
 	for index, _ := range list {

models/device_models.go

 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr                             string  `gorm:"column:urr" json:"urr" form:"urr"`
 }
 
 func (XtAssessmentAfterDislysis) TableName() string {

models/patient_models.go

 
 // 评分系统
 type XtPatientFallassessment 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"`
-	RecordDate       int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PingDate         int64 `gorm:"column:ping_date" json:"ping_date" form:"ping_date"`
-	AdminUserId      int64 `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Status           int64 `gorm:"column:status" json:"status" form:"status"`
-	IsCheck          int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	IsCheckOne       int64 `gorm:"column:is_check_one" json:"is_check_one" form:"is_check_one"`
-	IsCheckTwo       int64 `gorm:"column:is_check_two" json:"is_check_two" form:"is_check_two"`
-	IsCheckThree     int64 `gorm:"column:is_check_three" json:"is_check_three" form:"is_check_three"`
-	IsCheckFour      int64 `gorm:"column:is_check_four" json:"is_check_four" form:"is_check_four"`
-	IsCheckFive      int64 `gorm:"column:is_check_five" json:"is_check_five" form:"is_check_five"`
-	IsCheckSix       int64 `gorm:"column:is_check_six" json:"is_check_six" form:"is_check_six"`
-	IsCheckSeven     int64 `gorm:"column:is_check_seven" json:"is_check_seven" form:"is_check_seven"`
-	IsCheckEight     int64 `gorm:"column:is_check_eight" json:"is_check_eight" form:"is_check_eight"`
-	IsCheckNight     int64 `gorm:"column:is_check_night" json:"is_check_night" form:"is_check_night"`
-	IsCheckTen       int64 `gorm:"column:is_check_ten" json:"is_check_ten" form:"is_check_ten"`
-	IsCheckEleven    int64 `gorm:"column:is_check_eleven" json:"is_check_eleven" form:"is_check_eleven"`
-	IsCheckTwelve    int64 `gorm:"column:is_check_twelve" json:"is_check_twelve" form:"is_check_twelve"`
-	IsCheckThirteen  int64 `gorm:"column:is_check_thirteen" json:"is_check_thirteen" form:"is_check_thirteen"`
-	IsCheckFourteen  int64 `gorm:"column:is_check_fourteen" json:"is_check_fourteen" form:"is_check_fourteen"`
-	IsCheckFifteen   int64 `gorm:"column:is_check_fifteen" json:"is_check_fifteen" form:"is_check_fifteen"`
-	IsCheckSixteen   int64 `gorm:"column:is_check_sixteen" json:"is_check_sixteen" form:"is_check_sixteen"`
-	IsCheckSeventeen int64 `gorm:"column:is_check_seventeen" json:"is_check_seventeen" form:"is_check_seventeen"`
-	IsCheckEighteen  int64 `gorm:"column:is_check_eighteen" json:"is_check_eighteen" form:"is_check_eighteen"`
-	IsCheckNineteen  int64 `gorm:"column:is_check_nineteen" json:"is_check_nineteen" form:"is_check_nineteen"`
-	Ctime            int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Total            int64 `gorm:"column:total" json:"total" form:"total"`
+	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"`
+	RecordDate       int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PingDate         int64  `gorm:"column:ping_date" json:"ping_date" form:"ping_date"`
+	AdminUserId      int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	IsCheck          int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	IsCheckOne       int64  `gorm:"column:is_check_one" json:"is_check_one" form:"is_check_one"`
+	IsCheckTwo       int64  `gorm:"column:is_check_two" json:"is_check_two" form:"is_check_two"`
+	IsCheckThree     int64  `gorm:"column:is_check_three" json:"is_check_three" form:"is_check_three"`
+	IsCheckFour      int64  `gorm:"column:is_check_four" json:"is_check_four" form:"is_check_four"`
+	IsCheckFive      int64  `gorm:"column:is_check_five" json:"is_check_five" form:"is_check_five"`
+	IsCheckSix       int64  `gorm:"column:is_check_six" json:"is_check_six" form:"is_check_six"`
+	IsCheckSeven     int64  `gorm:"column:is_check_seven" json:"is_check_seven" form:"is_check_seven"`
+	IsCheckEight     int64  `gorm:"column:is_check_eight" json:"is_check_eight" form:"is_check_eight"`
+	IsCheckNight     int64  `gorm:"column:is_check_night" json:"is_check_night" form:"is_check_night"`
+	IsCheckTen       int64  `gorm:"column:is_check_ten" json:"is_check_ten" form:"is_check_ten"`
+	IsCheckEleven    int64  `gorm:"column:is_check_eleven" json:"is_check_eleven" form:"is_check_eleven"`
+	IsCheckTwelve    int64  `gorm:"column:is_check_twelve" json:"is_check_twelve" form:"is_check_twelve"`
+	IsCheckThirteen  int64  `gorm:"column:is_check_thirteen" json:"is_check_thirteen" form:"is_check_thirteen"`
+	IsCheckFourteen  int64  `gorm:"column:is_check_fourteen" json:"is_check_fourteen" form:"is_check_fourteen"`
+	IsCheckFifteen   int64  `gorm:"column:is_check_fifteen" json:"is_check_fifteen" form:"is_check_fifteen"`
+	IsCheckSixteen   int64  `gorm:"column:is_check_sixteen" json:"is_check_sixteen" form:"is_check_sixteen"`
+	IsCheckSeventeen int64  `gorm:"column:is_check_seventeen" json:"is_check_seventeen" form:"is_check_seventeen"`
+	IsCheckEighteen  int64  `gorm:"column:is_check_eighteen" json:"is_check_eighteen" form:"is_check_eighteen"`
+	IsCheckNineteen  int64  `gorm:"column:is_check_nineteen" json:"is_check_nineteen" form:"is_check_nineteen"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Total            int64  `gorm:"column:total" json:"total" form:"total"`
+	Content          string `gorm:"column:content" json:"content" form:"content"`
+	ContentOne       string `gorm:"column:content_one" json:"content_one" form:"content_one"`
+	ContentTwo       string `gorm:"column:content_two" json:"content_two" form:"content_two"`
+	ContentThree     string `gorm:"column:content_three" json:"content_three" form:"content_three"`
+	ContentFour      string `gorm:"column:content_four" json:"content_four" form:"content_four"`
+	ContentFive      string `gorm:"column:content_five" json:"content_five" form:"content_five"`
+	ContentSix       string `gorm:"column:content_six" json:"content_six" form:"content_six"`
+	ContentSeven     string `gorm:"column:content_seven" json:"content_seven" form:"content_seven"`
+	ContentEight     string `gorm:"column:content_eight" json:"content_eight" form:"content_eight"`
+	ContentNight     string `gorm:"column:content_night" json:"content_night" form:"content_night"`
+	ContentAdd       string `gorm:"column:content_add" json:"content_add" form:"content_add"`
+	ContentAddOne    string `gorm:"column:content_add_one" json:"content_add_one" form:"content_add_one"`
 }
 
 func (XtPatientFallassessment) TableName() string {
 	return "xt_patient_fallassessment"
 }
 
-type VmXtPatientFallassessment 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"`
-	RecordDate                     int64                             `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PingDate                       int64                             `gorm:"column:ping_date" json:"ping_date" form:"ping_date"`
-	AdminUserId                    int64                             `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Status                         int64                             `gorm:"column:status" json:"status" form:"status"`
-	IsCheck                        int64                             `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	IsCheckOne                     int64                             `gorm:"column:is_check_one" json:"is_check_one" form:"is_check_one"`
-	IsCheckTwo                     int64                             `gorm:"column:is_check_two" json:"is_check_two" form:"is_check_two"`
-	IsCheckThree                   int64                             `gorm:"column:is_check_three" json:"is_check_three" form:"is_check_three"`
-	IsCheckFour                    int64                             `gorm:"column:is_check_four" json:"is_check_four" form:"is_check_four"`
-	IsCheckFive                    int64                             `gorm:"column:is_check_five" json:"is_check_five" form:"is_check_five"`
-	IsCheckSix                     int64                             `gorm:"column:is_check_six" json:"is_check_six" form:"is_check_six"`
-	IsCheckSeven                   int64                             `gorm:"column:is_check_seven" json:"is_check_seven" form:"is_check_seven"`
-	IsCheckEight                   int64                             `gorm:"column:is_check_eight" json:"is_check_eight" form:"is_check_eight"`
-	IsCheckNight                   int64                             `gorm:"column:is_check_night" json:"is_check_night" form:"is_check_night"`
-	IsCheckTen                     int64                             `gorm:"column:is_check_ten" json:"is_check_ten" form:"is_check_ten"`
-	IsCheckEleven                  int64                             `gorm:"column:is_check_eleven" json:"is_check_eleven" form:"is_check_eleven"`
-	IsCheckTwelve                  int64                             `gorm:"column:is_check_twelve" json:"is_check_twelve" form:"is_check_twelve"`
-	IsCheckThirteen                int64                             `gorm:"column:is_check_thirteen" json:"is_check_thirteen" form:"is_check_thirteen"`
-	IsCheckFourteen                int64                             `gorm:"column:is_check_fourteen" json:"is_check_fourteen" form:"is_check_fourteen"`
-	IsCheckFifteen                 int64                             `gorm:"column:is_check_fifteen" json:"is_check_fifteen" form:"is_check_fifteen"`
-	IsCheckSixteen                 int64                             `gorm:"column:is_check_sixteen" json:"is_check_sixteen" form:"is_check_sixteen"`
-	IsCheckSeventeen               int64                             `gorm:"column:is_check_seventeen" json:"is_check_seventeen" form:"is_check_seventeen"`
-	IsCheckEighteen                int64                             `gorm:"column:is_check_eighteen" json:"is_check_eighteen" form:"is_check_eighteen"`
-	IsCheckNineteen                int64                             `gorm:"column:is_check_nineteen" json:"is_check_nineteen" form:"is_check_nineteen"`
-	Ctime                          int64                             `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                          int64                             `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Total                          int64                             `gorm:"column:total" json:"total" form:"total"`
-	XtPatientFallassessmentAdd     []*XtPatientFallassessmentAdd     `json:"PatientFallassessmentAdd" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentAddCopy []*XtPatientFallassessmentAddCopy `json:"PatientFallassessmentAddCopy" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentAge     []*XtPatientFallassessmentAge     `json:"PatientFallassessmentAge" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentBody    []*XtPatientFallassessmentBody    `json:"XtPatientFallassessmentBody" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentCare    []*XtPatientFallassessmentCare    `json:"XtPatientFallassessmentCare" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentExcrete []*XtPatientFallassessmentExcrete `json:"XtPatientFallassessmentExcrete" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentFall    []*XtPatientFallassessmentFall    `json:"XtPatientFallassessmentFall" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentHistory []*XtPatientFallassessmentHistory `json:"XtPatientFallassessmentHistory" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentMedical []*XtPatientFallassessmentMedical `json:"XtPatientFallassessmentMedical" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentOrgan   []*XtPatientFallassessmentOrgan   `json:"XtPatientFallassessmentOrgan" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentPrevent []*XtPatientFallassessmentPrevent `json:"XtPatientFallassessmentPrevent" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-	XtPatientFallassessmentRealize []*XtPatientFallassessmentRealize `json:"XtPatientFallassessmentRealize" gorm:"foreignkey:FassementId;AssociationForeignKey:ID;"`
-}
-
-func (VmXtPatientFallassessment) TableName() string {
-	return "xt_patient_fallassessment"
-}
-
-type XtPatientFallassessmentAdd struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentAdd) TableName() string {
-	return "xt_patient_fallassessment_add"
-}
-
-type XtPatientFallassessmentAddCopy struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentAddCopy) TableName() string {
-	return "xt_patient_fallassessment_add_copy"
-}
-
-type XtPatientFallassessmentAge struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentAge) TableName() string {
-	return "xt_patient_fallassessment_age"
-}
-
-type XtPatientFallassessmentBody struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentBody) TableName() string {
-	return "xt_patient_fallassessment_body"
-}
-
-type XtPatientFallassessmentCare struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentCare) TableName() string {
-	return "xt_patient_fallassessment_care"
-}
-
-type XtPatientFallassessmentExcrete struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentExcrete) TableName() string {
-	return "xt_patient_fallassessment_excrete"
-}
-
-type XtPatientFallassessmentFall struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentFall) TableName() string {
-	return "xt_patient_fallassessment_fall"
-}
-
-type XtPatientFallassessmentHistory struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentHistory) TableName() string {
-	return "xt_patient_fallassessment_history"
-}
-
-type XtPatientFallassessmentMedical struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentMedical) TableName() string {
-	return "xt_patient_fallassessment_medical"
-}
-
-type XtPatientFallassessmentOrgan struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentOrgan) TableName() string {
-	return "xt_patient_fallassessment_organ"
-}
-
-type XtPatientFallassessmentPrevent struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentPrevent) TableName() string {
-	return "xt_patient_fallassessment_prevent"
-}
-
-type XtPatientFallassessmentRealize struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
-	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
-	Content       string `gorm:"column:content" json:"content" form:"content"`
-}
-
-func (XtPatientFallassessmentRealize) TableName() string {
-	return "xt_patient_fallassessment_realize"
-}
-
 type XtPatientPedFallssessment struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`
 	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 func (XtPatientCriticalOne) TableName() string {
 	return "xt_patient_critical_one"
 }
+
+type XtPatientBraden 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"`
+	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Total        int64  `gorm:"column:total" json:"total" form:"total"`
+	FirstPingfen int64  `gorm:"column:first_pingfen" json:"first_pingfen" form:"first_pingfen"`
+	TwoPingfen   int64  `gorm:"column:two_pingfen" json:"two_pingfen" form:"two_pingfen"`
+	ThreePingfen int64  `gorm:"column:three_pingfen" json:"three_pingfen" form:"three_pingfen"`
+	FourPingfen  int64  `gorm:"column:four_pingfen" json:"four_pingfen" form:"four_pingfen"`
+	FivePingfen  int64  `gorm:"column:five_pingfen" json:"five_pingfen" form:"five_pingfen"`
+	SixPingfen   int64  `gorm:"column:six_pingfen" json:"six_pingfen" form:"six_pingfen"`
+	FamaliySign  string `gorm:"column:famaliy_sign" json:"famaliy_sign" form:"famaliy_sign"`
+	PingDate     int64  `gorm:"column:ping_date" json:"ping_date" form:"ping_date"`
+	FirstLapeso  int64  `gorm:"column:first_lapeso" json:"first_lapeso" form:"first_lapeso"`
+	PingSign     string `gorm:"column:ping_sign" json:"ping_sign" form:"ping_sign"`
+	LeaderSign   string `gorm:"column:leader_sign" json:"leader_sign" form:"leader_sign"`
+	LeaderDate   int64  `gorm:"column:leader_date" json:"leader_date" form:"leader_date"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	FirstCheck   int64  `gorm:"column:first_check" json:"first_check" form:"first_check"`
+	TwoCheck     int64  `gorm:"column:two_check" json:"two_check" form:"two_check"`
+	ThreeCheck   int64  `gorm:"column:three_check" json:"three_check" form:"three_check"`
+	FourCheck    int64  `gorm:"column:four_check" json:"four_check" form:"four_check"`
+	FiveCheck    int64  `gorm:"column:five_check" json:"five_check" form:"five_check"`
+	SixCheck     int64  `gorm:"column:six_check" json:"six_check" form:"six_check"`
+	TwoLapeso    int64  `gorm:"column:two_lapeso" json:"two_lapeso" form:"two_lapeso"`
+	ThreeLapeso  int64  `gorm:"column:three_lapeso" json:"three_lapeso" form:"three_lapeso"`
+	Content      string `gorm:"column:content" json:"content" form:"content"`
+}
+
+func (XtPatientBraden) TableName() string {
+	return "xt_patient_braden"
+}
+
+type XtPatientBradenChild struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsCheckStatus int64  `gorm:"column:is_check_status" json:"is_check_status" form:"is_check_status"`
+	FassementId   int64  `gorm:"column:fassement_id" json:"fassement_id" form:"fassement_id"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Content       string `gorm:"column:content" json:"content" form:"content"`
+	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"`
+}
+
+func (XtPatientBradenChild) TableName() string {
+	return "xt_patient_braden_child"
+}
+
+type XtAgePatients struct {
+	ID                          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                        string `gorm:"column:name" json:"name" form:"name"`
+	Status                      int64  `gorm:"column:status" json:"status" form:"status"`
+	Age                         int64  `gorm:"column:age" json:"age" form:"age"`
+	Lapseto                     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	DialysisNo                  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	BeforSystolicBloodPressure  float64
+	BeforDiastolicBloodPressure float64
+	AfterSystolicBloodPressure  float64
+	AfterDiastolicBloodPressure float64
+	XueLin                      string
+	XueHongDanBai               string
+	XueGai                      string
+	JiaoZhengGai                string
+	JiaPanSu                    string
+	YiTieDanBai                 string
+	TieDanBai                   string
+	QianBaiDanBai               string
+	Crp                         string
+	Mg                          string
+	URR                         string
+	KTV                         string
+}
+
+func (XtAgePatients) TableName() string {
+
+	return "xt_patients"
+}

models/schedule_models.go

 	DeviceNumber               *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
 	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
 	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,Mode;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
+	HisPrescriptionProject     []*HisPrescriptionProject  `gorm:"ForeignKey:PatientId,schedule_date;AssociationForeignKey:PatientId,RecordDate" json:"his_prescription_project"`
 }
 
 func (VmBloodScheduleTwo) TableName() string {

service/common_service.go

 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
 	return
 }
+
+func GetPatientInspectionList(user_org_id int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Where("inspect_date>=? and inspect_date<=? and org_id = ? and status=1", 1704038400, 1711814400, user_org_id).Group("patient_id").Find(&inspection).Error
+
+	return inspection, err
+}

service/dialysis_solution_service.go

 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
-
 	if len(idArray) >= 1 {
 		db = db.Where("xt_schedule.id in(?)", idArray)
 	}
 	return advice, err
 }
 
-func GetAllHisAdviceTemplateList(user_org_id int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+func GetAllHisAdviceTemplateList(user_org_id int64, keywords string) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+	keywords = "%" + keywords + "%"
+	if len(keywords) > 0 {
+		err = XTReadDB().Where("user_org_id = ? and status = 1 and advice_name like ?", user_org_id, keywords).Find(&advice).Error
+		return advice, err
+	} else {
+		err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&advice).Error
+		return advice, err
+	}
 
-	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&advice).Error
-	return advice, err
 }
 
 func SaveDialysisSetting(setting models.XtDialysisSetting) error {
 }
 
 func GetDialysisAdviceSchedulistSix(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, idArray []string) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
+
 	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
 		db = db.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("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
-				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
-						return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
-					})
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+					return db.Where("org_id = ? and status = 1", orgID)
+				})
+			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
 				})
 			})
+		})
 		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).Find(&schedule).Error
 	} else {
 			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("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
-				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
-						return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
-					})
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+					return db.Where("org_id = ? and status = 1", orgID)
 				})
-			}).Find(&schedule).Error
+			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+				})
+			})
+		}).Find(&schedule).Error
 	}
 
 	return schedule, total, err

service/gobal_config_service.go

 }
 
 func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
-	db := readDb2.Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)

service/his_service.go

 }
 
 func SaveHisPrescription(tx *gorm.DB, prescription *models.HisPrescription) (err error) {
-	if err = tx.Model(&models.HisPrescription{}).Save(prescription).Error; err != nil {
+
+	err = tx.Model(&models.HisPrescription{}).Save(prescription).Error
+	if err != nil {
 		tx.Rollback()
 		return
 	}
 }
 
 func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
-	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
+
+	err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error
+
+	if err != nil {
 		tx.Rollback()
 		return
 	}
-	tx.Commit()
-
 	return
 }
 
 }
 
 func CreateHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
-	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
+	err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error
+	if err != nil {
 		tx.Rollback()
 		return
 	}
-	tx.Commit()
-
 	return
 }
 
+func GetLastHisProject(patient_id int64, user_org_id int64, record_date int64, tx *gorm.DB) (models.HisPrescriptionProject, error) {
+
+	prescriptionProject := models.HisPrescriptionProject{}
+	err := tx.Where("patient_id = ? and user_org_id = ? and record_date = ? and status=1", patient_id, user_org_id, record_date).Find(&prescriptionProject).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return prescriptionProject, err
+		}
+	}
+	return prescriptionProject, err
+}
+
 func CreateHisProjectThree(project *models.HisPrescriptionProject) (err error) {
 	tx := writeDb.Begin()
 	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
 		tx.Rollback()
 		return
 	}
-	tx.Commit()
-
 	return
 }
 
 		tx.Rollback()
 		return
 	}
-	tx.Commit()
-
 	return
 }
 
 	HifesPay           float64 `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
 	MayPay             float64 `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
 	SetlDetail         string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	SettleStartTime    int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime      int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 }
 
 func GetCheckAccountFormData(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (cus []*CustomAccountFormData, err error) {
 	if clr_type == "9903" {
-		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type = ? Group by o.id", org_id, start_time, end_time, insutype, clr_type).Scan(&cus).Error
+		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay, o.settle_start_time as settle_start_time, o.settle_end_time as settle_end_time  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type = ?   Group by o.id", org_id, start_time, end_time, insutype, clr_type).Scan(&cus).Error
 	} else {
-		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type <> 9903 Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
+		err = readDb.Raw("select o.setl_detail as setl_detail, o.maf_pay as maf_pay,  o.hifmi_pay  as hifmi_pay, o.hifob_pay as hifob_pay, o.cvlserv_pay as cvlserv_pay, o.hifes_pay as hifes_pay, o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt,o.hifp_pay as hifp_pay,o.settle_start_time as settle_start_time, o.settle_end_time as settle_end_time  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND o.insutype = ? AND o.clr_type <> 9903 Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
 	}
 
 	for _, item := range cus {
 		var total int64
-		readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND dialysis_date <= ? AND  dialysis_date >= ?", item.PatientId, end_time, start_time).Count(&total)
+		if item.SettleStartTime == 0 && item.SettleEndTime == 0 {
+			readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND dialysis_date <= ? AND  dialysis_date >= ?", item.PatientId, item.SettleAccountsDate, item.SettleAccountsDate).Count(&total)
+		} else {
+			readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND dialysis_date <= ? AND  dialysis_date >= ?", item.PatientId, item.SettleEndTime, item.SettleStartTime).Count(&total)
+		}
 		fmt.Println(total)
 		item.DialysisCount = total
 		fmt.Println(item.DialysisCount)
 		tx.Rollback()
 		return
 	}
-	tx.Commit()
 	return
 }
 

service/manage_center_service.go

 }
 
 func FindNewBaseDrugLibRecord(org_id int64, id int64, tx *gorm.DB) (lib models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
-	if err != nil {
-		tx.Rollback()
-		return
+	err = tx.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
 	}
-	tx.Commit()
+
 	return lib, err
 }
 

service/new_stock_service.go

 	return err
 }
 
+func AddNewCancelSumCountOne(storehouse_id int64, drug_id int64, user_org_id int64, cancel_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_cancel_count", gorm.Expr("sum_cancel_count + ?", cancel_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ReduceCancelSumCount(storehouse_id int64, drug_id int64, user_org_id int64, cancel_count int64, over_count int64) error {
 	db := writeDb.Begin()
 	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_cancel_count", gorm.Expr("sum_cancel_count - ?", cancel_count)).Error

service/patient_service.go

 	return
 }
 
-func GetLastPatientFallassessment(tx *gorm.DB, patient_id int64, user_org_id int64) (patientFallassessment models.XtPatientFallassessment, err error) {
-
-	err = tx.Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Last(&patientFallassessment).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-
-}
-
-func CreateFallassessmentAge(tx *gorm.DB, patientAge models.XtPatientFallassessmentAge) (err error) {
-
-	err = tx.Create(&patientAge).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentAge(tx *gorm.DB, patientAge models.XtPatientFallassessmentAge) (err error) {
-
-	err = tx.Create(&patientAge).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentOrgan(tx *gorm.DB, organ models.XtPatientFallassessmentOrgan) (err error) {
-
-	err = tx.Create(&organ).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-
-}
-
-func SaveFallassessmentOrgan(tx *gorm.DB, organ models.XtPatientFallassessmentOrgan) (err error) {
-
-	err = tx.Create(&organ).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-
-}
-
-func CreateFallassessmentHistory(tx *gorm.DB, history models.XtPatientFallassessmentHistory) (err error) {
-
-	err = tx.Create(&history).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentHistory(tx *gorm.DB, history models.XtPatientFallassessmentHistory) (err error) {
-
-	err = tx.Save(&history).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentExcrete(tx *gorm.DB, excrete models.XtPatientFallassessmentExcrete) (err error) {
-
-	err = tx.Create(&excrete).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-
-}
-
-func SaveFallassessmentExcrete(tx *gorm.DB, excrete models.XtPatientFallassessmentExcrete) (err error) {
-
-	err = tx.Save(&excrete).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-
-}
-
-func CreateFallassessmentBody(tx *gorm.DB, body models.XtPatientFallassessmentBody) (err error) {
-
-	err = tx.Create(&body).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentBody(tx *gorm.DB, body models.XtPatientFallassessmentBody) (err error) {
-
-	err = tx.Save(&body).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentMedical(tx *gorm.DB, medical models.XtPatientFallassessmentMedical) (err error) {
-
-	err = tx.Create(&medical).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentMedical(tx *gorm.DB, medical models.XtPatientFallassessmentMedical) (err error) {
-
-	err = tx.Save(&medical).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentFall(tx *gorm.DB, fall models.XtPatientFallassessmentFall) (err error) {
-
-	err = tx.Create(&fall).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentFall(tx *gorm.DB, fall models.XtPatientFallassessmentFall) (err error) {
-
-	err = tx.Save(&fall).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentPrevent(tx *gorm.DB, excrete models.XtPatientFallassessmentPrevent) (err error) {
-
-	err = tx.Create(&excrete).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentPrevent(tx *gorm.DB, excrete models.XtPatientFallassessmentPrevent) (err error) {
-
-	err = tx.Save(&excrete).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentPealize(tx *gorm.DB, realize models.XtPatientFallassessmentRealize) (err error) {
-
-	err = tx.Create(&realize).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentPealize(tx *gorm.DB, realize models.XtPatientFallassessmentRealize) (err error) {
-
-	err = tx.Create(&realize).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func CreateFallassessmentCare(tx *gorm.DB, care models.XtPatientFallassessmentCare) (err error) {
-
-	err = tx.Create(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
-func SaveFallassessmentCare(tx *gorm.DB, care models.XtPatientFallassessmentCare) (err error) {
-
-	err = tx.Save(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-
-	return
-}
-
 func GetPatientFallsessMentList(patient_id int64, user_org_id int64, limit int64, page int64) (list []*models.XtPatientFallassessment, total int64, err error) {
 
 	offset := (page - 1) * limit
 	return list, total, err
 }
 
-func CreateFallassessmentAdd(tx *gorm.DB, care models.XtPatientFallassessmentAdd) (err error) {
+func GetPatientFallsessMentListOne(ids []string, user_org_id int64) (list []*models.XtPatientFallassessment, err error) {
 
-	err = tx.Create(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-	return
-}
-
-func SaveFallassessmentAdd(tx *gorm.DB, care models.XtPatientFallassessmentAdd) (err error) {
+	db := XTReadDB().Model(&list).Where("status =1")
 
-	err = tx.Save(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", ids)
 	}
-	return
-}
-
-func XtPatientFallassessmentAddCopy(tx *gorm.DB, care models.XtPatientFallassessmentAddCopy) (err error) {
-
-	err = tx.Create(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
 	}
-	return
-}
+	err = db.Find(&list).Error
 
-func SavePatientFallassessmentAddCopy(tx *gorm.DB, care models.XtPatientFallassessmentAddCopy) (err error) {
-
-	err = tx.Create(&care).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return
-	}
-	return
+	return list, err
 }
 
-func GetPatientFallsessmentById(id int64, user_org_id int64) (models.VmXtPatientFallassessment, error) {
+func GetPatientFallsessmentById(id int64, user_org_id int64) (models.XtPatientFallassessment, error) {
 
-	fallassessment := models.VmXtPatientFallassessment{}
+	fallassessment := models.XtPatientFallassessment{}
 
-	err := XTReadDB().Where("id = ? and user_org_id = ?", id, user_org_id).Preload("XtPatientFallassessmentAdd", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentAge", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentAddCopy", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentBody", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentCare", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentExcrete", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentFall", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentHistory", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentMedical", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentOrgan", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentPrevent", "status=1 and user_org_id =?", user_org_id).Preload("XtPatientFallassessmentRealize", "status=1 and user_org_id =?", user_org_id).Find(&fallassessment).Error
+	err := XTReadDB().Where("id = ? and user_org_id = ?", id, user_org_id).Find(&fallassessment).Error
 
 	return fallassessment, err
 }
 func DeletePatientFallsessment(id int64, user_org_id int64) (models.XtPatientFallassessment, error) {
 
 	fallassessment := models.XtPatientFallassessment{}
-	err := XTWriteDB().Where("id =? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
-
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentAdd{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentAddCopy{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentAge{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentBody{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentCare{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentExcrete{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentFall{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentHistory{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentMedical{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentOrgan{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentPrevent{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.XtPatientFallassessmentRealize{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&fallassessment).Where("id =? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return fallassessment, err
 }
 
 
 	return err
 }
+
+func GetPatientFallsessMentListTwo(ids []string, user_org_id int64) (list []*models.XtPatientFallassessment, err error) {
+
+	db := XTReadDB().Model(&list).Where("status =1")
+
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", ids)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func CeatePatientSign(braden models.XtPatientBraden) error {
+
+	err := XTWriteDB().Create(&braden).Error
+
+	return err
+}
+
+func GetPatientBradenList(patient_id int64, limit int64, page int64, user_org_id int64) (list []*models.XtPatientBraden, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+
+	return list, total, err
+}
+
+func GetPatientBradenById(id int64) (models.XtPatientBraden, error) {
+
+	patientBraden := models.XtPatientBraden{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&patientBraden).Error
+
+	return patientBraden, err
+}
+
+func SavePatientBraden(braden models.XtPatientBraden) error {
+
+	err := XTWriteDB().Save(&braden).Error
+
+	return err
+}
+
+func DeletePatientBraden(id int64) error {
+
+	patientBraden := models.XtPatientBraden{}
+	err := XTWriteDB().Model(&patientBraden).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetBatchPatientBraden(ids []string, user_org_id int64) (list []*models.XtPatientBraden, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1")
+
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", ids)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetAllPatientListMap(user_org_id int64) (list []*models.XtAgePatients, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and status=1 and lapseto = 1", user_org_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetLastBefor(patient_id int64) (models.XtAssessmentBeforeDislysis, error) {
+
+	beforeDislysis := models.XtAssessmentBeforeDislysis{}
+
+	err := XTReadDB().Where("patient_id = ? and status=1 AND  assessment_date>=1704038400  AND  assessment_date<=1711814400", patient_id).Order("id asc").Last(&beforeDislysis).Limit(1).Error
+	return beforeDislysis, err
+}
+
+func GetLastRecordAfter(patient_id int64) (models.XtAssessmentAfterDislysis, error) {
+
+	afterDislysis := models.XtAssessmentAfterDislysis{}
+	err := XTReadDB().Where("patient_id = ? and status=1 AND assessment_date>=1704038400 AND assessment_date<=1711814400", patient_id).Order("id asc").Last(&afterDislysis).Limit(1).Error
+	return afterDislysis, err
+}
+
+func GetInspectionByPatientId(patient_id int64, item_id int64) (models.XtInspection, error) {
+
+	inspection := models.XtInspection{}
+
+	err := XTReadDB().Where("patient_id =? and status =1 and inspect_date>=1704038400 and inspect_date<=1711814400 and item_id =?", patient_id, item_id).Order("id asc").Last(&inspection).Limit(1).Error
+	return inspection, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

 		}).
 		Preload("AssessmentAfterDislysis", "user_org_id = ? AND status = 1", orgID).
 		Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-			return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, recordDate.Unix())
+			return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, recordDate.Unix()).Limit(1)
 		}).Preload("MonitoringRecords", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? AND status = 1", orgID).
 			Order("operate_time asc")

service/secondary_service.go

 
 	return stockFlow, err
 }
+
+func GetNewAllStoreHouseConfig(orgid int64, tx *gorm.DB) (models.XtStorehouseConfig, error) {
+
+	config := models.XtStorehouseConfig{}
+	err := tx.Where("user_org_id = ? and status = 1", orgid).First(&config).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return config, err
+		}
+	}
+
+	return config, err
+}

service/self_drug_service.go

 	return drug, err
 }
 
+func GetNewBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return drug, err
+		}
+
+	}
+	return drug, err
+}
+
 func ModifyDrugWarehouseByInfoId(id int64, stock_max_number int64) error {
 	info := models.DrugWarehouseInfo{}
 	err := XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", stock_max_number)).Error

service/user_service.go

 	return appRole, err
 }
 
-func GetDrugFlowDetailById(drug_id int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowDetailById(drug_id int64, org_id int64) (flow []*models.DrugFlow, err error) {
 
-	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =10402", drug_id).Order("id asc").Find(&flow).Error
+	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("id asc").Find(&flow).Error
 
 	return flow, err
 }

service/warhouse_service.go

 	return err
 }
 
+func UpdateNewGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func ChangeMaxNumber(id int64, count int64) error {
 
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
 	return err
 
+}
+
+func ChangeNewMaxNumber(id int64, count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
 }
 func ChangeMaxNumberOne(id int64, count int64) error {
 
 
 }
 
+func ChangeNewMaxNumberOne(id int64, count int64, tx *gorm.DB) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Updates(map[string]interface{}{"stock_max_number": count, "stock_min_number": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
+}
+
 func UpdateMinNumber(id int64, count int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Update(map[string]interface{}{"stock_min_number": count}).Error
 	return err
 }
 
+func UpdateNewMinNumber(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Update(map[string]interface{}{"stock_min_number": count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func FindLastDrugWarehouseOutInfo(orgid int64) (models.DrugWarehouseOutInfo, error) {
 	info := models.DrugWarehouseOutInfo{}
 	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&info).Error
 	return info, err
 }
 
+func FindNewLastDrugWarehouseOutInfo(orgid int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+	info := models.DrugWarehouseOutInfo{}
+	err := tx.Where("org_id = ? and status = 1", orgid).Last(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+	tx.Rollback()
+	return info, err
+}
+
 func GetAllGoodSumCount(goodid int64, orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = XTReadDB().Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goodid, orgid, storehouse_id).Find(&info).Error
 	return info, err
 }
 
+func GetNewAllGoodSumCount(goodid int64, orgid int64, storehouse_id int64, tx *gorm.DB) (info []*models.WarehousingInfo, err error) {
+
+	err = tx.Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goodid, orgid, storehouse_id).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
 func CreatedFlushInfo(info models.XtWarehouseFlushInfo) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&info).Error
 	return err
 }
 
+func ModifyNewGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func ModifyReduceGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
 
 	ut := XTWriteDB().Begin()
 	return err
 }
 
+func ModifyNewAddGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func UpdateSumAddCancelCount(user_org_id int64, good_id int64, storehouse_id int64, count int64) error {
 
 	ut := XTWriteDB().Begin()
 	return err
 }
 
+func UpdateNewSumAddCancelCount(user_org_id int64, good_id int64, storehouse_id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and good_id = ?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_cancel_count", gorm.Expr("stock_cancel_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateSumReduceCancelCount(user_org_id int64, good_id int64, storehouse_id int64, count int64) error {
 
 	ut := XTWriteDB().Begin()
 	return err
 }
 
+func CreateNewAutoDetail(detail models.AutomaticReduceDetail, tx *gorm.DB) error {
+
+	err := tx.Create(&detail).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateAutomaticReduce(patient_id int64, record_date int64, good_id int64, project_id int64) error {
 
 	err := XTWriteDB().Model(&models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time =? and good_id = ? and project_id = ? and status = 1", patient_id, record_date, good_id, project_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
+func UpdateNewAutomaticReduce(patient_id int64, record_date int64, good_id int64, project_id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time =? and good_id = ? and project_id = ? and status = 1", patient_id, record_date, good_id, project_id).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func GetDrugFLowByAdviceById(drug_id int64, patient_id int64, user_org_id int64, advice_date int64) (outInfo []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and patient_id = ? and org_id = ? and sys_record_time = ? and status= 1", drug_id, patient_id, user_org_id, advice_date).Find(&outInfo).Error
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
-
+		fmt.Println(out)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			timeStr := time.Now().Format("2006-01-02")
 			}
 		}
 
-		// 出库流程
-		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		//出库流程
+		//1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
+			NewBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
 
 		} else {
 			return errors.New("药品信息不存在")
 
 	return
 }
+
+// 保存处方出库
+func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, count int64, tx *gorm.DB) (err error) {
+
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+
+	// 如果没有对应的库存，则报错
+	warehouse, err := FindNewFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId, tx)
+	if err != nil {
+		goodErrcode := models.XtGoodErrcode{
+			UserOrgId:      goods.UserOrgId,
+			Errcode:        "查询库存信息报错",
+			GoodId:         goods.GoodId,
+			Status:         1,
+			Ctime:          time.Now().Unix(),
+			Mtime:          0,
+			Count:          0,
+			StockCount:     0,
+			Creater:        creator,
+			BatchNumberId:  warehouse.ID,
+			WarehouseOutId: 0,
+		}
+		CreateGoodErrcode(goodErrcode)
+		return err
+	}
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+		maxNumber = goods.Count
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+
+		//扣减库存
+		errThree := UpDateNewWarehouseInfoByStock(&warehouse, tx)
+		if errThree != nil {
+			goodErrcode := models.XtGoodErrcode{
+				UserOrgId:      goods.UserOrgId,
+				Errcode:        "扣减库存失败",
+				GoodId:         goods.GoodId,
+				Status:         1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Count:          0,
+				StockCount:     0,
+				Creater:        creator,
+				BatchNumberId:  warehouse.ID,
+				WarehouseOutId: 0,
+			}
+			CreateGoodErrcode(goodErrcode)
+			return errThree
+		}
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		//查询已经出库的数据
+		flowGood, _ := GetNewStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId, tx)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+
+		//查询退库数据
+		flowGoodTwo, _ := GetNewStockFlowIsBatchNumberFour(patient_id, record_time, goods.GoodId, goods.ProjectId, tx)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+
+		var out_count_two int64
+
+		wareOutList, _ := GetNewStockFlowIsBatchNumberSixty(patient_id, record_time, goods.GoodId, goods.ProjectId, tx)
+		for _, item := range wareOutList {
+			out_count_two += item.Count
+		}
+
+		OutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		OutInfo.Count = count - out_count_two + out_count_one
+
+		_, errcodes := GetNewNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID, tx)
+		fmt.Println("errcodes-------------------------------------------", errcodes)
+		if errcodes == gorm.ErrRecordNotFound {
+			errOne := AddNewSigleWarehouseOutInfo(OutInfo, tx)
+			if errOne != nil {
+				return errOne
+			}
+		} else if errcodes == nil {
+			outInfoOne, _ := GetNewWarehouseOutInfoIsExistThree(goods.GoodId, patient_id, record_time, goods.ProjectId, tx)
+			if count != outInfoOne.Count {
+				UpdatedNewWarehouseOutInfo(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId, tx)
+			}
+
+		}
+
+		lastOut, _ := FindNewWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId, tx)
+
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		fmt.Println("本次出库数据", count)
+		fmt.Println("历史出库数据", out_count)
+		fmt.Println("退库数据", out_count_one)
+		if count > (out_count - out_count_one) {
+
+			stockFlow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   count - out_count + out_count_one,
+				UserOrgId:               orgID,
+				PatientId:               goods.PatientId,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				IsSys:                   1,
+				WarehousingOrder:        warehouse.WarehousingOrder,
+				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsEdit:                  1,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				Creator:                 creator,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice, //零售价
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    goods.ID,
+				CancelOutDetailId:       0,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            warehouse.StorehouseId,
+				AdminUserId:             creator,
+				BuyPrice:                warehouse.Price, //进货价
+				StockCount:              "",
+				BatchNumberCount:        warehouse.StockCount - goods.Count,
+				IsCheck:                 1,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+				ProjectId:               goods.ProjectId,
+			}
+			//创建出库流水
+			errflow := CreateNewStockFlowOne(stockFlow, tx)
+			if errflow != nil {
+				goodErrcode := models.XtGoodErrcode{
+					UserOrgId:      orgID,
+					Errcode:        "创建流水报错",
+					GoodId:         goods.GoodId,
+					Status:         1,
+					Ctime:          time.Now().Unix(),
+					Mtime:          0,
+					Count:          0,
+					StockCount:     0,
+					Creater:        creator,
+					BatchNumberId:  warehouse.ID,
+					WarehouseOutId: 0,
+				}
+				CreateGoodErrcode(goodErrcode)
+			}
+
+			//更新出库数量
+			errsumcode := ModifyNewGoodSumCount(goods.StorehouseId, stockFlow.Count, orgID, goods.GoodId, tx)
+			if errsumcode != nil {
+				goodErrcode := models.XtGoodErrcode{
+					UserOrgId:      orgID,
+					Errcode:        "更新出库数量报错",
+					GoodId:         goods.GoodId,
+					Status:         1,
+					Ctime:          time.Now().Unix(),
+					Mtime:          0,
+					Count:          0,
+					StockCount:     0,
+					Creater:        creator,
+					BatchNumberId:  warehouse.ID,
+					WarehouseOutId: 0,
+				}
+				CreateGoodErrcode(goodErrcode)
+			}
+		}
+
+		//如果本次出库数据小于历史出库数据 新增1条退库流水
+
+		if count < (out_count - out_count_one) {
+
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindNewAllCancelStockTotal(orgID, tx)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(record_time, orgID, tx)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+				AddNewSigleCancelStock(&cancelStock, tx)
+			}
+
+			cancel, _ := GetNewLastCancelStockById(orgID, tx)
+
+			manufacturer, _ := GetNewManufactureById(warehouse.Manufacturer, tx)
+			deaerler, _ := GetNewDealerById(warehouse.Dealer, tx)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+			CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+			cancelInfo, _ := GetLastNewCancelStockInfoByGoodId(goods.GoodId, tx)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - out_count_one - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			CreateNewStockFlowOne(flow, tx)
+
+			//退库数量增加
+			UpdateNewSumAddCancelCount(orgID, goods.GoodId, goods.StorehouseId, flow.Count, tx)
+			ModifyNewAddGoodSumCount(goods.StorehouseId, flow.Count, orgID, goods.GoodId, tx)
+		}
+
+		//添加入库ID
+		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+		if errWarehouse != nil {
+			goodErrcode := models.XtGoodErrcode{
+				UserOrgId:      orgID,
+				Errcode:        "添加入库ID报错",
+				GoodId:         goods.GoodId,
+				Status:         1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Count:          0,
+				StockCount:     0,
+				Creater:        creator,
+				BatchNumberId:  warehouse.ID,
+				WarehouseOutId: 0,
+			}
+			CreateGoodErrcode(goodErrcode)
+		}
+
+		if warehouse.StockCount < maxNumber {
+			goodErrcode := models.XtGoodErrcode{
+				UserOrgId:      orgID,
+				Errcode:        "出库接口库存数量不足",
+				GoodId:         goods.GoodId,
+				Status:         1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Count:          0,
+				StockCount:     0,
+				Creater:        creator,
+				BatchNumberId:  warehouse.ID,
+				WarehouseOutId: 0,
+			}
+			CreateGoodErrcode(goodErrcode)
+			return errors.New("库存数量不足")
+
+		}
+
+		return nil
+	} else {
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateNewWarehouseInfoByStock(&warehouse, tx)
+		if errThree != nil {
+			goodErrcode := models.XtGoodErrcode{
+				UserOrgId:      orgID,
+				Errcode:        "扣减库存报错",
+				GoodId:         goods.GoodId,
+				Status:         1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Count:          0,
+				StockCount:     0,
+				Creater:        creator,
+				BatchNumberId:  warehouse.ID,
+				WarehouseOutId: 0,
+			}
+			CreateGoodErrcode(goodErrcode)
+			return errThree
+		}
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+		fmt.Println("剩余库存", sum_count)
+
+		OutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		OutInfo.Count = stock_number
+
+		_, errcodes := GetNewNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID, tx)
+		if errcodes == gorm.ErrRecordNotFound {
+			errOne := AddNewSigleWarehouseOutInfo(OutInfo, tx)
+			if errOne != nil {
+				return errOne
+			}
+		} else if errcodes == nil {
+
+			outInfoOne, _ := GetNewWarehouseOutInfoIsExistTen(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID, tx)
+			if count != outInfoOne.Count {
+				UpdatedNewWarehouseOutInfoSix(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID, tx)
+			}
+
+		}
+
+		lastOut, _ := FindNewWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId, tx)
+
+		//查询该该批次已经出库的数据
+		flowGood, _ := GetNewStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId, tx)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+		flowGoodTwo, _ := GetNewStockFlowIsBatchNumberFour(patient_id, record_time, goods.GoodId, goods.ProjectId, tx)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果出库数量 大于 历史出库数据 新增1条流水
+		if count > out_count-out_count_one {
+			stockFlow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   stock_number,
+				UserOrgId:               orgID,
+				PatientId:               goods.PatientId,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				IsSys:                   1,
+				WarehousingOrder:        warehouse.WarehousingOrder,
+				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsEdit:                  1,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				Creator:                 creator,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice, //零售价
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    goods.ID,
+				CancelOutDetailId:       0,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            warehouse.StorehouseId,
+				AdminUserId:             creator,
+				BuyPrice:                warehouse.Price, //进货价
+				StockCount:              "",
+				BatchNumberCount:        0,
+				IsCheck:                 1,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+				ProjectId:               goods.ProjectId,
+			}
+			//创建出库流水
+			errflow := CreateNewStockFlowOne(stockFlow, tx)
+			if errflow != nil {
+				goodErrcode := models.XtGoodErrcode{
+					UserOrgId:      orgID,
+					Errcode:        "创建出库流水报错",
+					GoodId:         goods.GoodId,
+					Status:         1,
+					Ctime:          time.Now().Unix(),
+					Mtime:          0,
+					Count:          0,
+					StockCount:     0,
+					Creater:        creator,
+					BatchNumberId:  warehouse.ID,
+					WarehouseOutId: 0,
+				}
+				CreateGoodErrcode(goodErrcode)
+			}
+
+			//更新出库数量
+			errcodecout := ModifyNewGoodSumCount(goods.StorehouseId, stock_number, orgID, goods.GoodId, tx)
+
+			if errcodecout != nil {
+				goodErrcode := models.XtGoodErrcode{
+					UserOrgId:      orgID,
+					Errcode:        "更新出库数量报错",
+					GoodId:         goods.GoodId,
+					Status:         1,
+					Ctime:          time.Now().Unix(),
+					Mtime:          0,
+					Count:          0,
+					StockCount:     0,
+					Creater:        creator,
+					BatchNumberId:  warehouse.ID,
+					WarehouseOutId: 0,
+				}
+				CreateGoodErrcode(goodErrcode)
+			}
+		}
+
+		//退库
+		if count < out_count-out_count_one {
+
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindNewAllCancelStockTotal(orgID, tx)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(record_time, orgID, tx)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+				AddNewSigleCancelStock(&cancelStock, tx)
+			}
+
+			cancel, _ := GetNewLastCancelStockById(orgID, tx)
+
+			manufacturer, _ := GetNewManufactureById(warehouse.Manufacturer, tx)
+			deaerler, _ := GetNewDealerById(warehouse.Dealer, tx)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+			CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+			cancelInfo, _ := GetLastNewCancelStockInfoByGoodId(goods.GoodId, tx)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.Price,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			CreateNewStockFlowOne(flow, tx)
+
+			//退库数量增加
+			UpdateNewSumAddCancelCount(orgID, goods.GoodId, goods.StorehouseId, flow.Count, tx)
+			//实际出库减少
+			ModifyNewAddGoodSumCount(goods.StorehouseId, flow.Count, orgID, goods.GoodId, tx)
+		}
+
+		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+		if errWarehouse != nil {
+			goodErrcode := models.XtGoodErrcode{
+				UserOrgId:      orgID,
+				Errcode:        "添加入库ID报错",
+				GoodId:         goods.GoodId,
+				Status:         1,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Count:          0,
+				StockCount:     0,
+				Creater:        creator,
+				BatchNumberId:  warehouse.ID,
+				WarehouseOutId: 0,
+			}
+			CreateGoodErrcode(goodErrcode)
+		}
+
+	}
+
+	goods.Count = deliver_number - stock_number
+	prepare := &models.DialysisBeforePrepare{
+		Count:        deliver_number - stock_number,
+		GoodTypeId:   goods.GoodTypeId,
+		GoodId:       goods.GoodId,
+		PatientId:    goods.PatientId,
+		RecordDate:   goods.RecordDate,
+		UserOrgId:    orgID,
+		Ctime:        time.Now().Unix(),
+		Creater:      creator,
+		Status:       1,
+		StorehouseId: goods.StorehouseId,
+		ProjectId:    goods.ProjectId,
+	}
+	ConsumableNewPrescriptionDelivery(orgID, patient_id, record_time, prepare, warehouseOut, creator, count, tx)
+
+	return nil
+}