hahah

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 2301
+		userAdmin.Id = 5318
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 2301 //4，809
+		userAdmin.Id = 5318 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9779 //机构id
+		subscibe.OrgId = 10777 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9779  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17634 //4
+		adminUserInfo.CurrentOrgId = 10777 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11811 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 2301
+		userAdmin.Id = 5318
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 2301 //4，809
+		userAdmin.Id = 5318 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9779 //机构id小英9675或4
+		subscibe.OrgId = 10777 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9779  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17634 //4
+		adminUserInfo.CurrentOrgId = 10777 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11811 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -87,14 +87,17 @@ func (c *DataApiController) CreateConfig() {
 	// 验证关键字段的值是否重复
 
 	thisConfig, _ := service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName, adminUserInfo.CurrentOrgId)
-	fmt.Println("99999", thisConfig)
+
 	if thisConfig.ID > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
 		return
 	}
 
-	fieldValue := service.GetChildValue(dataconfig.Module, dataconfig.ParentId, adminUserInfo.CurrentOrgId)
-	dataconfig.Value = fieldValue + 1
+	//fieldValue := service.GetChildValue(dataconfig.Module, dataconfig.ParentId, adminUserInfo.CurrentOrgId)
+
+	dataconfiList, _ := service.FindConfigByTitleOne(dataconfig.Module, adminUserInfo.CurrentOrgId)
+
+	dataconfig.Value = len(dataconfiList) + 200
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -130,6 +133,7 @@ func (c *DataApiController) CreateConfig() {
 		resultConfig.CreateUserId = dataconfig.CreateUserId
 		resultConfig.Title = dataconfig.Title
 		resultConfig.Content = dataconfig.Content
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/dialysis_api_controller.go

@@ -153,6 +153,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/schedule/getpatientbefor", &DialysisApiController{}, "Get:GetPatientBefor")
 
+	beego.Router("/api/schedule/getbednumberlist", &DialysisApiController{}, "Get:GetNewBedNumberList")
+
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3025,13 +3027,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10777 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 && adminUserInfo.CurrentOrgId != 10480 && adminUserInfo.CurrentOrgId != 10293 && adminUserInfo.CurrentOrgId != 9478 && adminUserInfo.CurrentOrgId != 10744 && adminUserInfo.CurrentOrgId != 10766 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 && adminUserInfo.CurrentOrgId != 10480 && adminUserInfo.CurrentOrgId != 10293 && adminUserInfo.CurrentOrgId != 9478 && adminUserInfo.CurrentOrgId != 10744 && adminUserInfo.CurrentOrgId != 10766 && adminUserInfo.CurrentOrgId != 10777 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3401,8 +3403,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10757 || adminUserInfo.CurrentOrgId == 9478 {
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 && adminUserInfo.CurrentOrgId != 9478 {
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10757 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10777 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 && adminUserInfo.CurrentOrgId != 9478 && adminUserInfo.CurrentOrgId != 10777 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3497,6 +3499,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			newprescribe.Amylaceum = dialysisSolution.Amylaceum
+
 			newprescribe.Status = 1
 			if adminUserInfo.CurrentOrgId == 10579 {
 				newprescribe.Modifier = 0
@@ -3679,7 +3682,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 10768 || adminUserInfo.CurrentOrgId == 10777 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -3866,6 +3869,30 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 			}
 		}
 		err := service.AddSigleSummaryRecord(&treatmentSummary)
+
+		if adminUserInfo.CurrentOrgId == 10777 {
+			//查询该该账号是不是医生
+			userAdminName := service.GetUserAdminNameType(adminUserInfo.AdminUser.Id, adminUserInfo.CurrentOrgId)
+
+			if userAdminName != 3 {
+
+				record := models.PatientDiseaseCourse{
+					OrgID:      adminUserInfo.CurrentOrgId,
+					PatientID:  patient,
+					Recorder:   adminUserInfo.AdminUser.Id,
+					RecordTime: time.Now().Unix(),
+					Content:    specialRecord,
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					ModifyTime: time.Now().Unix(),
+					Title:      "日常病程",
+					RecordDate: recordDate.Unix(),
+				}
+
+				service.CreatePatientCourseOfDisease(&record)
+			}
+
+		}
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.CurrentOrgId,
@@ -3940,8 +3967,30 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		treatmentSummary.UpdatedTime = time.Now().Unix()
 		treatmentSummary.Modifier = adminUserInfo.AdminUser.Id
 		treatmentSummary.ID = tempTreatmentSummary.ID
+
 		err := service.UpdateSummeRecord(&treatmentSummary)
 
+		if adminUserInfo.CurrentOrgId == 10777 {
+			//查询该该账号是不是医生
+			userAdminName := service.GetUserAdminNameType(adminUserInfo.AdminUser.Id, adminUserInfo.CurrentOrgId)
+			if userAdminName != 3 {
+
+				record := models.PatientDiseaseCourse{
+					OrgID:      adminUserInfo.CurrentOrgId,
+					PatientID:  patient,
+					Recorder:   adminUserInfo.AdminUser.Id,
+					RecordTime: time.Now().Unix(),
+					Content:    specialRecord,
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					ModifyTime: time.Now().Unix(),
+					Title:      "日常病程",
+					RecordDate: recordDate.Unix(),
+				}
+				service.ModifyPatientCoursesOne(&record)
+			}
+		}
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
 		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
 		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
@@ -8612,8 +8661,39 @@ func (this *DialysisApiController) GetPatientBefor() {
 
 	prescription, _ := service.GetDialysisPrescribeOneList(patient_id, startdateunix, user_org_id)
 
+	access, _ := service.GetNewPatientVascularAccess(patient_id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patientBefor": patientBefor,
 		"prescription": prescription,
+		"access":       access,
+	})
+}
+
+func (c *DialysisApiController) GetNewBedNumberList() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	fmt.Println("patient_id----------------", patient_id)
+
+	record_date := c.GetString("record_date")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	recordDateStr, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", record_date)
+	fmt.Println("parseDateErr------------------", parseDateErr)
+	if parseDateErr != nil {
+		c.ErrorLog("日期(%v)解析错误：%v", recordDateStr, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	schedule, _ := service.GetNewPatientSchedule(patient_id, recordDateStr.Unix(), orgId)
+
+	number, _ := service.GetNewBedNumber(schedule.BedId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"number": number,
 	})
+
 }

controllers/his_api_controller.go

@@ -2261,7 +2261,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			for _, item := range prescriptions {
 				items := item.(map[string]interface{})
 
-				if adminInfo.CurrentOrgId == 9478 {
+				if adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10768 {
 					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 						advices := items["advices"].([]interface{})
 						if len(advices) > 0 {
@@ -2364,7 +2364,7 @@ func (c *HisApiController) CreateHisPrescription() {
 		return
 	}
 
-	if adminInfo.CurrentOrgId == 9478 {
+	if adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10768 {
 		//不是保存处方出库
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 
@@ -11115,7 +11115,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 		tm := time.Unix(time.Now().Unix(), 0)
 
-		allTotal := fmt.Sprintf("%.4f", total)
+		allTotal := fmt.Sprintf("%.2f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		order := &models.HisOrder{
 			UserOrgId:             adminUser.CurrentOrgId,
@@ -11174,7 +11174,7 @@ func (c *HisApiController) GetUploadInfo() {
 						cus := &Custom{
 							AdviceId:         subItem.ID,
 							ProjectId:        0,
-							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
 							Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.4f", subItem.Price),
@@ -11194,7 +11194,7 @@ func (c *HisApiController) GetUploadInfo() {
 						cus := &Custom{
 							AdviceId:         0,
 							ProjectId:        subItem.ID,
-							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
 							Cut:              fmt.Sprintf("%.4f", cnt),
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
@@ -11209,7 +11209,7 @@ func (c *HisApiController) GetUploadInfo() {
 							cus := &Custom{
 								AdviceId:         0,
 								ProjectId:        subItem.ID,
-								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+								DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
 								Cut:              fmt.Sprintf("%.4f", cnt),
 								FeedetlSn:        subItem.FeedetlSn,
 								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
@@ -11230,7 +11230,7 @@ func (c *HisApiController) GetUploadInfo() {
 					ItemId:           item.ID,
 					AdviceId:         0,
 					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.4f", item.Price),
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
 					Cut:              fmt.Sprintf("%.4f", float64(item.Count)),
 					FeedetlSn:        item.FeedetlSn,
 					Price:            fmt.Sprintf("%.4f", float64(item.Price)),
@@ -11259,6 +11259,9 @@ func (c *HisApiController) GetUploadInfo() {
 				if item.CostType == 3 {
 					med_chrgitm_type = "04"
 				}
+				if (adminUser.CurrentOrgId == 9478 && item.CostType == 12) || (adminUser.CurrentOrgId == 9478 && item.CostType == 16) || (adminUser.CurrentOrgId == 9478 && item.CostType == 3) {
+					med_chrgitm_type = "04"
+				}
 				if item.CostType == 8 {
 					med_chrgitm_type = "03"
 				}
@@ -11269,9 +11272,8 @@ func (c *HisApiController) GetUploadInfo() {
 			} else if item.Type == 3 {
 				advice_id = 0
 				item_id = item.ItemId
-				project_id = 0
+				project_id = item.ProjectId
 				med_chrgitm_type = "08"
-
 			}
 			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
 			cut, _ := strconv.ParseFloat(item.Cut, 32)
@@ -11297,6 +11299,7 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			service.CreateOrderInfoTX(info, tx)
 		}
+
 		his.Diagnosis = diagnosis_id
 		his.SickType = sick_type
 		his.RegisterType = reg_type

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -413,6 +413,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	// 先走redis，没有走数据库
 	schedual, _ := service.MobileGetSchedualDetailOne(adminInfo.Org.Id, patientID, date.Unix())
+
 	go func() {
 		patient, _ = service.FindPatientByIdWithDiseases(adminInfo.Org.Id, patientID)
 
@@ -658,6 +659,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	firstMonitor, _ := service.GetFirstMonitorOne(patientID, date.Unix(), adminInfo.Org.Id)
 
+	access, _ := service.GetNewPatientVascularAccess(patientID)
+
+	numberList, _ := service.GetNewBedNumber(schedual.BedId)
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -697,6 +702,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"dryWeightList":                  dryWeightList,
 		"firstMonitor":                   firstMonitor,
 		"lastMonitor":                    lastMonitor,
+		"access":                         access,
+		"numberList":                     numberList,
 	}
 
 	this.ServeSuccessJSON(returnData)
@@ -729,9 +736,9 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	deboardNurseId, _ := c.GetInt64("deboardNurse", 0)
 	treatDoctor, _ := c.GetInt64("treatDoctor", 0)
 	nursingRecord := c.GetString("nursing_record")
-	fmt.Println("护理记录", nursingRecord)
+
 	specialRecord := c.GetString("special_record")
-	fmt.Println("特殊记录", specialRecord)
+
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	changeMedicalNurseId = adminUserInfo.AdminUser.Id
@@ -805,6 +812,31 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	if treatmentSummary.ID == 0 { //新增
 		summary.Creater = adminUserInfo.AdminUser.Id
 		service.AddSigleSummaryRecord(&summary)
+
+		if adminUserInfo.Org.Id == 10777 {
+			//查询该该账号是不是医生
+			userAdminName := service.GetUserAdminNameType(adminUserInfo.AdminUser.Id, adminUserInfo.Org.Id)
+
+			if userAdminName != 3 {
+
+				record := models.PatientDiseaseCourse{
+					OrgID:      adminUserInfo.Org.Id,
+					PatientID:  id,
+					Recorder:   adminUserInfo.AdminUser.Id,
+					RecordTime: time.Now().Unix(),
+					Content:    specialRecord,
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					ModifyTime: time.Now().Unix(),
+					Title:      "日常病程",
+					RecordDate: recordDate.Unix(),
+				}
+
+				service.CreatePatientCourseOfDisease(&record)
+			}
+
+		}
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -841,6 +873,28 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		summary.Modifier = adminUserInfo.AdminUser.Id
 		summary.ID = treatmentSummary.ID
 		service.UpdateSummeRecord(&summary)
+
+		if adminUserInfo.Org.Id == 10777 {
+			//查询该该账号是不是医生
+			userAdminName := service.GetUserAdminNameType(adminUserInfo.AdminUser.Id, adminUserInfo.Org.Id)
+			if userAdminName != 3 {
+
+				record := models.PatientDiseaseCourse{
+					OrgID:      adminUserInfo.Org.Id,
+					PatientID:  id,
+					Recorder:   adminUserInfo.AdminUser.Id,
+					RecordTime: time.Now().Unix(),
+					Content:    specialRecord,
+					Status:     1,
+					CreateTime: time.Now().Unix(),
+					ModifyTime: time.Now().Unix(),
+					Title:      "日常病程",
+					RecordDate: recordDate.Unix(),
+				}
+				service.ModifyPatientCoursesOne(&record)
+			}
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
 		redis := service.RedisClient()
 		//清空key 值
@@ -2977,7 +3031,6 @@ func (c *DialysisAPIController) Finish() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	fmt.Println(endmonitorRecords.UltrafiltrationVolume)
 
 	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 	if getAADErr != nil {
@@ -3439,6 +3492,10 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.SystolicBloodPressure = 0
 	}
 
+	if adminUserInfo.Org.Id == 10777 {
+		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+	}
+
 	tempassessmentAfterDislysis.RecordTime = dialysisOrder.EndTime
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
@@ -4400,6 +4457,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10777 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 			if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10757 {
 				if prescription.ModeId == 2 {
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
@@ -4483,6 +4545,27 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
+			//标注
+			if adminUserInfo.Org.Id == 10777 {
+				if prescription.ID > 0 {
+
+					if prescription.ModeId == 2 || prescription.ModeId == 5 || prescription.ModeId == 12 {
+						totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+						if totalMin == 0 {
+							totalMin = 240
+						}
+						if prescription.DisplaceLiquiValue == 0 {
+							prescription.DisplaceLiquiValue = 15
+						}
+
+						//乘10 除10是为了保留一位小数
+						replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+
+						fmt.Println("replacement_rate------------------", replacement_rate)
+					}
+
+				}
+			}
 		}
 	}
 
@@ -4524,6 +4607,25 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 	}
 
+	if adminUserInfo.Org.Id == 10777 {
+		if prescription.ID == 0 {
+
+			if prescription.ModeId == 2 || prescription.ModeId == 5 || prescription.ModeId == 12 {
+				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+				if totalMin == 0 {
+					totalMin = 240
+				}
+				if prescription.DisplaceLiquiValue == 0 {
+					prescription.DisplaceLiquiValue = 15
+				}
+
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+			}
+
+		}
+	}
+
 	record := models.MonitoringRecord{
 		UserOrgId:       adminUserInfo.Org.Id,
 		PatientId:       patientID,
@@ -4652,6 +4754,15 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.PulseFrequency = befor.PulseFrequency
 		}
 
+		if adminUserInfo.Org.Id == 10777 {
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			dialysisPrescription, _ := service.GetDialysisPrescription(patientID, adminUserInfo.Org.Id, recordDate.Unix())
+			record.BreathingRate = befor.BreathingRate
+			record.BloodFlowVolume = dialysisPrescription.BloodFlowVolume
+			record.Temperature = befor.Temperature
+			record.PulseFrequency = befor.PulseFrequency
+		}
+
 		if adminUserInfo.Org.Id != 10683 {
 			err = service.CreateMonitor(&record)
 		}
@@ -5835,6 +5946,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 10777 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+			}
+
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10679 {
 				record.UltrafiltrationRate = 0
 			}
@@ -5926,7 +6042,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 || adminInfo.Org.Id == 10667 || adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10766 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 || adminInfo.Org.Id == 10667 || adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10777 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -5975,7 +6091,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = 0
 	}
 
-	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10752 || adminInfo.Org.Id == 10757 || adminInfo.Org.Id == 10766 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10752 || adminInfo.Org.Id == 10757 || adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10777 {
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
@@ -6063,7 +6179,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
-	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 || adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10766 {
+	//标注
+	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 || adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10777 {
 
 		var replacement_rate float64
 		var displacement_quantity float64
@@ -6072,6 +6189,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 		record.ReplacementRate = replacement_rate
 		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
+
 		record.DisplacementQuantity = displacement_quantity
 	}
 
@@ -6106,20 +6224,22 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
-	if adminInfo.Org.Id == 9478 {
-		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-		if totalMin == 0 {
-			totalMin = 240
-		}
-		if prescription.DisplaceLiquiValue == 0 {
-			prescription.DisplaceLiquiValue = 15
+	if adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10777 {
+		if prescription.ModeId == 2 || prescription.ModeId == 5 || prescription.ModeId == 12 {
+			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+			if totalMin == 0 {
+				totalMin = 240
+			}
+			if prescription.DisplaceLiquiValue == 0 {
+				prescription.DisplaceLiquiValue = 15
+			}
+			var replacement_rate float64
+			//乘10 除10是为了保留一位小数
+			replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+
+			record.ReplacementRate = replacement_rate
 		}
-		var replacement_rate float64
-		//乘10 除10是为了保留一位小数
-		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
 
-		fmt.Println("hahahahahhaahahah", replacement_rate)
-		record.ReplacementRate = replacement_rate
 	}
 
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3878,9 +3878,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 10768 || adminUserInfo.Org.Id == 10777 {
 
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 && adminUserInfo.Org.Id != 10766 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 && adminUserInfo.Org.Id != 10766 && adminUserInfo.Org.Id != 10777 {
 				dewater_amount = dewater_amount * 1000
 			}
 
@@ -4714,7 +4714,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		}
 	}
 
-	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10768 {
+	if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10768 || adminUserInfo.Org.Id == 10777 {
 
 		if evaluation.ID > 0 {
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -741,6 +741,14 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 				service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, org_id)
 			}
 		}
+
+		if org_id == 10633 {
+
+			prescription, _ := service.GetDialysisPrescription(schedule.PatientId, org_id, schedule.ScheduleDate)
+			if prescription.ID > 0 {
+				service.DeleteDialysisPrescription(prescription.ID)
+			}
+		}
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
@@ -890,7 +898,15 @@ func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
 	}
 	service.UpdatedScheduleMode(schedule, id)
 
+	scheduleObj, _ := service.GetScheduleId(id)
+
 	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	prescription, _ := service.GetDialysisPrescription(scheduleObj.PatientId, orgId, schedule.ScheduleDate)
+	if prescription.ID > 0 {
+		service.UpdateDialysisPrescriptionModeId(prescription.ID, mode_id)
+	}
+
 	//记录日志
 	byterequest, _ := json.Marshal(schedule)
 	scheduleLog := models.XtScheduleLog{

controllers/patient_api_controller.go

@@ -8484,6 +8484,8 @@ func (this *PatientApiController) CreateNewCourseOfDiaseaseRecord() {
 	content := dataBody["content"].(string)
 	admin_user_id := int64(dataBody["admin_user_id"].(float64))
 
+	title := dataBody["title"].(string)
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	patientCourse := models.PatientDiseaseCourse{
@@ -8496,7 +8498,7 @@ func (this *PatientApiController) CreateNewCourseOfDiaseaseRecord() {
 		Status:     1,
 		CreateTime: time.Now().Unix(),
 		ModifyTime: time.Now().Unix(),
-		Title:      "",
+		Title:      title,
 	}
 
 	service.CreateNewCourseOfDiaseaseRecord(patientCourse)

controllers/pharmacy_controller.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"strconv"
@@ -46,7 +47,7 @@ func PharmacyApiRegistRouters() {
 
 	beego.Router("/api/pharmacy/updatedruginventorywarehouseinfo", &PharmacyController{}, "Get:UpdateDrugInventoryWarehouseInfo")
 
-	beego.Router("/api/pharmacy/changedrugcode", &PharmacyController{}, "Get:ChangeDrugCode")
+	beego.Router("/api/pharmacy/changedrugcode", &PharmacyController{}, "Post:ChangeDrugCode")
 
 	beego.Router("/api/pharmacy/changeZeroFlag", &PharmacyController{}, "Get:ChangeZeroFlag")
 
@@ -1441,23 +1442,64 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 
 func (this *PharmacyController) ChangeDrugCode() {
 
-	id, _ := this.GetInt64("id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	data_source, _ := this.GetInt64("data_source")
-	drug_code := this.GetString("drug_code")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	id := int64(dataBody["id"].(float64))
+
+	data_source := int64(dataBody["data_source"].(float64))
+
+	drug_code := dataBody["drug_code"].(string)
+
+	//if dataBody["codeinfo"] != nil && reflect.TypeOf(dataBody["codeinfo"]).String() == "[]interface {}" {
+	//	prescriptions, _ := dataBody["codeinfo"].([]interface{})
+	//	if len(prescriptions) > 0 {
+	//		for _, item := range prescriptions {
+	//			var name string
+	//			if item.(map[string]interface{})["name"] != nil || reflect.TypeOf(item.(map[string]interface{})["name"]).String() == "string" {
+	//				name = item.(map[string]interface{})["name"].(string)
+	//			}
+	//			var count int64
+	//			if item.(map[string]interface{})["count"] != nil || reflect.TypeOf(item.(map[string]interface{})["count"]).String() == "float64" {
+	//				count = int64(item.(map[string]interface{})["count"].(float64))
+	//			}
+	//
+	//			fmt.Println("name=====", name)
+	//			fmt.Println("count====", count)
+	//
+	//			//hisPrescriptionProject, _ := service.GetHisPrescriptionByProject(id)
+	//
+	//			//查询这个耗材的已经扫码过的数据
+	//			//service.GetWarehouseOoutInfo(name)
+	//
+	//		}
+	//	}
+	//}
 
 	str := strings.Replace(drug_code, " ", "", -1)
 	// 去除换行符
 	str = strings.Replace(str, "\n", "", -1)
+
 	if data_source == 1 {
 		service.ChangeHisDrugCode(id, str, orgId)
 
 	}
+
 	if data_source == 2 {
 		service.ChangeAdivceDrugCode(id, str, orgId)
 	}
 
+	//耗材
 	if data_source == 3 {
+
+		if orgId == 10164 {
+
+			//fmt.Println("roleIds", role_ids)
+			//for _, item := range role_ids {
+			//	fmt.Println("item------", item)
+			//}
+		}
 		service.ChangeHisProjectCode(id, str, orgId)
 	}
 
@@ -1466,6 +1508,24 @@ func (this *PharmacyController) ChangeDrugCode() {
 	})
 }
 
+func CountOccurrences(roleIds []int64) []map[int64]int {
+	// 创建一个map来记录每个值的出现次数
+	countMap := make(map[int64]int)
+
+	// 遍历数组，统计每个值的出现次数
+	for _, id := range roleIds {
+		countMap[id]++
+	}
+
+	// 将统计结果转换为数组对象
+	var result []map[int64]int
+	for id, count := range countMap {
+		result = append(result, map[int64]int{id: count})
+	}
+
+	return result
+}
+
 func (this *PharmacyController) ChangeZeroFlag() {
 	id, _ := this.GetInt64("id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId

controllers/schedule_api_controller.go

@@ -2257,6 +2257,14 @@ func (c *ScheduleApiController) DeleteSchedule() {
 		}
 	}
 
+	if adminINfo.CurrentOrgId == 10633 {
+
+		prescription, _ := service.GetDialysisPrescription(schedule.PatientId, adminINfo.CurrentOrgId, schedule.ScheduleDate)
+		if prescription.ID > 0 {
+			service.DeleteDialysisPrescription(prescription.ID)
+		}
+	}
+
 	redis := service.RedisClient()
 
 	//处方

controllers/self_drug_api_congtroller.go

@@ -205,6 +205,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/patient/changegoodwarehouseinfo", &SelfDrugApiController{}, "Post:ChangeGoodWarehouseInfo")
 
+	beego.Router("/api/good/getrepatgoodlist", &SelfDrugApiController{}, "Post:GetReatGoodList")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6934,3 +6936,39 @@ func (this *SelfDrugApiController) ChangeGoodWarehouseInfo() {
 	})
 
 }
+
+func (this *SelfDrugApiController) GetReatGoodList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	good_str := dataBody["good_str"].(string)
+
+	good_id := int64(dataBody["good_id"].(float64))
+
+	var ids []string
+	if len(good_str) > 0 {
+		ids = strings.Split(good_str, ",")
+	}
+
+	if len(ids) > 0 {
+		for _, item := range ids {
+			goodcodeinfo, _ := service.GetReatGoodList(item, good_id, orgId)
+			if goodcodeinfo.ID > 0 {
+				this.ServeDynamicFailJsonSend("追溯码:" + item + "已经重复入库")
+				return
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -424,6 +424,8 @@ func (c *StockManagerApiController) CreateWarehouse() {
 				register_number, _ := items["register_number"].(string)
 
 				good_code, _ := items["good_code"].(string)
+
+				split_of_number := int64(items["split_of_number"].(float64))
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					ID:               id,
@@ -451,6 +453,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					IsCheck:          2,
 					RegisterNumber:   register_number,
 					GoodCode:         good_code,
+					SplitOfNumber:    split_of_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -537,7 +540,7 @@ func (c *StockManagerApiController) GetWarehouseList() {
 		}
 	}
 	warehouseList, total, err := service.FindAllWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, check_type)
-	fmt.Println("ottal--------", total)
+
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -722,6 +725,8 @@ func (c *StockManagerApiController) EditWarehouse() {
 				}
 				id := int64(items["id"].(float64))
 
+				split_of_number := int64(items["split_of_number"].(float64))
+
 				if id == 0 {
 					warehouseInfo := &models.WarehousingInfo{
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -748,6 +753,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						IsCheck:          2,
 						RegisterNumber:   register_number,
 						GoodCode:         good_code,
+						SplitOfNumber:    split_of_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -777,6 +783,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						StorehouseId:     storehouse_id,
 						RegisterNumber:   register_number,
 						GoodCode:         good_code,
+						SplitOfNumber:    split_of_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -7497,6 +7504,8 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	//更改审核状态
 	err := service.UpdateNewCheckWarehouseInfo(warehousing_info_id, checker, tx)
 	var is_success = 2
+	var total_one int64
+	var total_two int64
 	if err == nil {
 		list, _ := service.GetNewWarehouseInfoList(warehousing_info_id, orgId, tx)
 
@@ -7619,23 +7628,37 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 			goodcodelist := strings.Split(item.GoodCode, ",")
 
 			if len(goodcodelist) > 0 {
-				goodInfo, _ := service.GetNewGoodByIdIsStop(item.GoodId, item.OrgId, tx)
+				//goodInfo, _ := service.GetNewGoodByIdIsStop(item.GoodId, item.OrgId, tx)
 				for _, it := range goodcodelist {
-					if it != "" {
-						codeInfo := models.XtGoodCodeInfo{
-							GoodId:          item.GoodId,
-							BatchNumber:     item.Number,
-							GoodCode:        it,
-							WarehouseInfoId: item.ID,
-							IsUserCount:     0,
-							IsOutStatus:     2,
-							Status:          1,
-							UserOrgId:       item.OrgId,
-							Ctime:           time.Now().Unix(),
-							Mtime:           time.Now().Unix(),
-							SplitOfNumber:   goodInfo.SplitOfNumber,
+
+					//查询改追溯码是否已经入库过
+					goodCodeInfo, _ := service.GetGoodCodeIsUsered(item.GoodId, item.OrgId, it)
+
+					if goodCodeInfo.ID == 0 {
+
+						if it != "" {
+							codeInfo := models.XtGoodCodeInfo{
+								GoodId:          item.GoodId,
+								BatchNumber:     item.Number,
+								GoodCode:        it,
+								WarehouseInfoId: item.ID,
+								IsUserCount:     0,
+								IsOutStatus:     2,
+								Status:          1,
+								UserOrgId:       item.OrgId,
+								Ctime:           time.Now().Unix(),
+								Mtime:           time.Now().Unix(),
+								SplitOfNumber:   item.SplitOfNumber,
+							}
+							service.CreateCodeInfo(codeInfo, tx)
+							total_one = total_one + 1
 						}
-						service.CreateCodeInfo(codeInfo, tx)
+
+					}
+
+					if goodCodeInfo.ID > 0 {
+
+						total_two = total_two + 1
 					}
 
 				}
@@ -7649,7 +7672,9 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": "list",
+			"list":      "list",
+			"total_one": total_one,
+			"totalTwo":  total_two,
 		})
 	}
 	return
@@ -8141,7 +8166,7 @@ func (this *StockManagerApiController) GetGoodPatientName() {
 
 func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//list, _ := service.GetAllBaseDrugList(orgId)
 	//
@@ -8217,7 +8242,7 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
 	//}
 
-	drugList, _ := service.GetAllBaseDrugListTwentyOne(9478)
+	drugList, _ := service.GetAllBaseDrugListTwentyOne(orgId)
 
 	for _, item := range drugList {
 		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit

models/patient_models.go

@@ -732,6 +732,7 @@ type PatientDiseaseCourse struct {
 	CreateTime int64  `gorm:"column:ctime" json:"-" form:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-" form:"-"`
 	Title      string `gorm:"column:title" json:"title"`
+	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
 func (PatientDiseaseCourse) TableName() string {

models/stock_models.go

@@ -180,6 +180,7 @@ type WarehousingInfo struct {
 	ManafacturerName          string                  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
 	DealerName                string                  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 	GoodCode                  string                  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SplitOfNumber             int64                   `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -1559,6 +1560,7 @@ type VmWarehousingInfoSix struct {
 	SecondWarehouseInfoId     int64    `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	RegisterNumber            string   `gorm:"column:register_number" json:"register_number" form:"register_number"`
 	GoodCode                  string   `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SplitOfNumber             int64    `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 }
 
 func (VmWarehousingInfoSix) TableName() string {

service/auto_create_week_disinfection.go

@@ -231,6 +231,24 @@ func GetDialysisPrescription(patientid int64, orgID int64, timenow int64) (model
 	return prescription, err
 }
 
+func UpdateDialysisPrescriptionModeId(id int64, mode_id int64) error {
+
+	prescription := models.DialysisPrescription{}
+
+	err := XTWriteDB().Model(&prescription).Where("id = ? and status=1", id).Updates(map[string]interface{}{"mode_id": mode_id}).Error
+
+	return err
+}
+
+func DeleteDialysisPrescription(id int64) error {
+
+	prescription := models.XtDialysisPrescription{}
+
+	err := XTWriteDB().Model(&prescription).Where("id= ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
 func GetAssessmentAfterDissData(patientid int64, orgID int64, timenow int64) (models.XtAssessmentAfterDislysis, error) {
 	dislysis := models.XtAssessmentAfterDislysis{}
 	err := XTReadDB().Where("patient_id = ? AND user_org_id = ? AND assessment_date = ?", patientid, orgID, timenow).Find(&dislysis).Error

service/data.go

@@ -233,6 +233,11 @@ func FindConfigByTitle(module string, title string, org_id int64) (dataconfig mo
 	return
 }
 
+func FindConfigByTitleOne(module string, org_id int64) (dataconfig []*models.Dataconfig, err error) {
+	err = readDb.Model(&models.Dataconfig{}).Where("module=? and org_id in (0,?) and status = 1", module, org_id).Find(&dataconfig).Error
+	return
+}
+
 func FindConfigByName(module string, name string, parent_id int64, org_id int64) (dataconfig models.Dataconfig, err error) {
 	err = readDb.Model(&models.Dataconfig{}).Where("module=? and name=? and parent_id=? and org_id in (0,?) and status = 1", module, name, parent_id, org_id).First(&dataconfig).Error
 	return

service/dialysis_solution_service.go

@@ -222,9 +222,6 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id []
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	//if partition_id > 0 {
-	//	db = db.Where("partition_id = ?", partition_id)
-	//}
 
 	if len(partition_id) > 0 {
 		db = db.Where("partition_id in(?)", partition_id)

service/doctor_schedule_service.go

@@ -739,6 +739,15 @@ func UpdatedScheduleMode(schedule models.XtSchedule, id int64) error {
 	return err
 }
 
+func GetScheduleId(id int64) (models.Schedule, error) {
+
+	schedule := models.Schedule{}
+
+	err := XTReadDB().Where("id=? an status=1", id).Find(&schedule).Error
+
+	return schedule, err
+}
+
 func UpdatedSchedule(schedule models.XtSchedule, patient_id int64, schedule_date int64, schedule_type int64, bed_id int64) error {
 
 	xtSchedule := models.XtSchedule{}

service/his_service.go

@@ -3181,6 +3181,15 @@ func CreateCodeInfo(info models.XtGoodCodeInfo, tx *gorm.DB) error {
 	return err
 }
 
+func GetGoodCodeIsUsered(good_id int64, user_org_id int64, good_code string) (models.XtGoodCodeInfo, error) {
+
+	codeInfo := models.XtGoodCodeInfo{}
+
+	err := XTReadDB().Where("good_id=? and user_org_id = ? and good_code = ? and status=1", good_id, user_org_id, good_code).Find(&codeInfo).Error
+
+	return codeInfo, err
+}
+
 func CreateDrugCodeInfo(info models.XtDrugCodeInfo, tx *gorm.DB) error {
 
 	err := tx.Create(&info).Error

service/manage_center_service.go

@@ -331,7 +331,7 @@ func GetBaseDrugLibList(org_id int64, keyword string, page int64, limit int64, i
 	}
 	offset := (page - 1) * limit
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&list).Error
 	return
 }
 
@@ -1171,3 +1171,11 @@ func ModifyGoodCodeWarehouseInfo(id int64, good_code string) (models.XtWarehouse
 
 	return info, err
 }
+
+func GetReatGoodList(good_code string, good_id int64, user_org_id int64) (models.XtGoodCodeInfo, error) {
+
+	codeInfo := models.XtGoodCodeInfo{}
+	err = XTReadDB().Where("good_id = ? and good_code = ? and status=1 and user_org_id = ?", good_id, good_code, user_org_id).Find(&codeInfo).Error
+
+	return codeInfo, err
+}

service/manage_service.go

@@ -1684,7 +1684,7 @@ func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time
 	if len(storey) > 0 {
 		db = db.Where("storey =?", storey)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date asc").Find(&list).Error
 	return list, total, err
 }
 

service/new_warehouse_service.go

@@ -4781,6 +4781,10 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
 		}
 
+		if orgID == 9478 {
+			ModifyDrugPriceList(advice.DrugId, warehouse.RetailPrice, drup.MinNumber, tx)
+		}
+
 		return nil
 
 	} else {
@@ -4952,6 +4956,10 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 		advice.PrescribingNumberUnit = drup.MinUnit
 
 		HisStoryBloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit, tx)
+
+		if orgID == 9478 {
+			ModifyDrugPriceList(advice.DrugId, warehouse.RetailPrice, drup.MinNumber, tx)
+		}
 	}
 
 	return

service/patient_dataconfig_service.go

@@ -119,6 +119,11 @@ func ModifyPatientCourses(record *models.PatientDiseaseCourse) error {
 	return err
 }
 
+func ModifyPatientCoursesOne(record *models.PatientDiseaseCourse) error {
+	err := writeDb.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and patient_id = ? and status = 1 and record_date = ?", record.OrgID, record.PatientID, record.RecordDate).Updates(map[string]interface{}{"content": record.Content, "record_time": record.RecordTime, "mtime": time.Now().Unix(), "title": record.Title}).Error
+	return err
+}
+
 func ModifyPatientSickHistory(record *models.XtPatientSickHistory) error {
 	err := writeDb.Save(record).Error
 	//err := writeDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and status = 1 and id = ?", record.OrgId, record.PatientId, record.ID).Updates(map[string]interface{}{"content": record.Content, "record_time": record.RecordTime, "mtime": time.Now().Unix(), "title": record.Title}).Error

service/patient_service.go

@@ -4428,6 +4428,15 @@ func GetDialysisPrescribeOneList(patient_id int64, record_date int64, user_org_i
 	return prescription, err
 }
 
+func GetNewPatientVascularAccess(patient_id int64) (models.XtPatientVascularAccess, error) {
+
+	access := models.XtPatientVascularAccess{}
+
+	err = XTReadDB().Where("patient_id = ? and user_status = 1", patient_id).Last(&access).Error
+
+	return access, err
+}
+
 func CreateDeathSummary(summary models.XtDeathSummary) error {
 
 	err := XTWriteDB().Save(&summary).Error
@@ -4510,7 +4519,7 @@ func CreateNewCourseOfDiaseaseRecord(course models.PatientDiseaseCourse) error {
 
 func GetPatientCoureseOfDiseasesList(patient_id int64, org_id int64) (list []*models.PatientDiseaseCourse, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and org_id = ? and status=1", patient_id, org_id).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and status=1", patient_id, org_id).Order("record_time desc").Find(&list).Error
 
 	return list, err
 
@@ -5627,3 +5636,21 @@ func GetPatientCountFlowByIdList(patient_id int64, orgId int64, mode_id int64, i
 
 	return flow, err
 }
+
+func GetNewPatientSchedule(patient_id int64, schedule_date int64, user_org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTReadDB().Where("patient_id = ? and schedule_date=? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&schedule).Error
+
+	return schedule, err
+}
+
+func GetNewBedNumber(id int64) (models.DeviceNumber, error) {
+
+	number := models.DeviceNumber{}
+
+	err = XTReadDB().Where("id=?", id).Find(&number).Error
+
+	return number, err
+}

service/pharmacy_service.go

@@ -1599,6 +1599,13 @@ func GetUserAdminName(id, orgID int64) string {
 	return tmp.UserName
 }
 
+// 获取领药人姓名（
+func GetUserAdminNameType(id, orgID int64) int64 {
+	var tmp models.XTSgjUserAdminRole
+	XTReadDB().Model(&models.XTSgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgID).Find(&tmp)
+	return tmp.UserType
+}
+
 // 根据id查询是否已发药,true已发药，false未发药gai
 func GiveTheMedicine(id int64) bool {
 	var xue models.PharmacyDoctorAdvice
@@ -3044,3 +3051,12 @@ func GetWaitPharmacyHISGoodsPatient(zone_id int64, sch_type int64, record_date i
 	err = db.Where("xt_patients.user_org_id = ?", org_id).Group("xt_patients.id").Find(&patient).Error
 	return
 }
+
+func GetHisPrescriptionByProject(id int64) (models.HisPrescriptionProject, error) {
+
+	prescriptionProject := models.HisPrescriptionProject{}
+
+	err := XTReadDB().Where("id=? and status=1", id).Find(&prescriptionProject).Error
+
+	return prescriptionProject, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -231,6 +231,7 @@ type PrescriptionVM struct {
 	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 }
 
 func (PrescriptionVM) TableName() string {

service/stock_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"fmt"
+	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -359,7 +360,7 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 		}
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&list).Error
 	return
 }
 
@@ -576,11 +577,11 @@ func CreateNewWarehousingInfo(warehousingInfo []*models.WarehousingInfo, tx *gor
 	if len(warehousingInfo) > 0 {
 
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_info (warehousing_id, good_id, good_type_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,stock_count,license_number,packing_price,storehouse_id,good_code) VALUES "
+			thisSQL := "INSERT INTO xt_warehouse_info (warehousing_id, good_id, good_type_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,stock_count,license_number,packing_price,storehouse_id,good_code,split_of_number) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -604,6 +605,7 @@ func CreateNewWarehousingInfo(warehousingInfo []*models.WarehousingInfo, tx *gor
 				insertData = append(insertData, info.PackingPrice)
 				insertData = append(insertData, info.StorehouseId)
 				insertData = append(insertData, info.GoodCode)
+				insertData = append(insertData, info.SplitOfNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = tx.Exec(thisSQL, insertData...).Error
@@ -1211,7 +1213,7 @@ func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int6
 	if check_type > 0 {
 		db = db.Where("xt_warehouse.is_check = ?", check_type)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("xt_warehouse.warehousing_time desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("xt_warehouse.warehousing_time desc,xt_warehouse.id desc").Find(&list).Error
 	return
 }
 
@@ -1460,7 +1462,7 @@ func FindAllDrugWarehousingListOne(orgId int64, page int64, limit int64, startTi
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.warehousing_time desc").Find(&list).Error
+	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.warehousing_time desc,xt_drug_warehouse.id desc").Find(&list).Error
 	return
 }
 
@@ -4099,6 +4101,19 @@ func UpdateNewSingleDrugAutoReduceRecordInfo(id int64, count int64, tx *gorm.DB)
 	return err
 }
 
+func ModifyDrugPriceList(drug_id int64, retail_price float64, min_number int64, tx *gorm.DB) error {
+
+	result := float64(min_number) * retail_price
+	//保留两位小数的方法1：使用math.Round
+	rounded := math.Round(result*100) / 100
+	err = tx.Model(models.Drug{}).Where("id = ? and status=1", drug_id).Updates(map[string]interface{}{"min_price": retail_price, "retail_price": rounded}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func AddNewSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail, tx *gorm.DB) error {
 
 	err := tx.Create(&detail).Error
@@ -4665,7 +4680,12 @@ func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (dr
 
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(drug_name LIKE ?)", likekey).Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0) and storehouse_id = ?", orgid, storehouse_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		// 转义特殊字符（如 % _ \）
+		//escapedKeywords := strings.ReplaceAll(keywords, "%", "\\%")
+		//escapedKeywords = strings.ReplaceAll(escapedKeywords, "_", "\\_")
+		//escapedKeywords = strings.ReplaceAll(escapedKeywords, "\\", "\\\\")
+		//likekey := "%" + escapedKeywords + "%"
+		err = db.Where("(drug_name LIKE ? ESCAPE '\\\\')", likekey).Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0) and storehouse_id = ?", orgid, storehouse_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
 		}).Find(&drug).Error
 	} else {
@@ -4697,7 +4717,12 @@ func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (go
 	db := XTReadDB().Model(&good).Where("org_id =? and status = 1  AND find_in_set('停用',good_status) = 0", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(good_name Like ?)", likekey).Preload("LaStWarehousingInfo", "org_id=? and status = 1 and stock_count <> 0 and storehouse_id =?", orgid, storehouse_id).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		// 转义特殊字符（如 % _ \）
+		//escapedKeywords := strings.ReplaceAll(keywords, "%", "\\%")
+		//escapedKeywords = strings.ReplaceAll(escapedKeywords, "_", "\\_")
+		//escapedKeywords = strings.ReplaceAll(escapedKeywords, "\\", "\\\\")
+		//likekey := "%" + escapedKeywords + "%"
+		err = db.Where("(good_name Like ?) ", likekey).Preload("LaStWarehousingInfo", "org_id=? and status = 1 and stock_count <> 0 and storehouse_id =?", orgid, storehouse_id).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id =?", orgid, storehouse_id)
 		}).Find(&good).Error
 	} else {
@@ -7453,7 +7478,7 @@ func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) erro
 
 func UpdateNewWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64, tx *gorm.DB) error {
 
-	err := tx.Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId, "good_code": info.GoodCode}).Error
+	err := tx.Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId, "good_code": info.GoodCode, "split_of_number": info.SplitOfNumber}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -8732,7 +8757,7 @@ func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 
 func UpdateNewWarehouseDetail(info *models.WarehousingInfo, id int64, tx *gorm.DB) error {
 
-	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice, "register_number": info.RegisterNumber, "storehouse_id": info.StorehouseId, "good_code": info.GoodCode}).Error
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice, "register_number": info.RegisterNumber, "storehouse_id": info.StorehouseId, "good_code": info.GoodCode, "split_of_number": info.SplitOfNumber}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/warhouse_service.go

@@ -8837,6 +8837,8 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 
 		CreatedDialysisPrepare(autoMatic, tx)
 
+		ModifyGoodPakingPrice(goods.GoodId, warehouse.PackingPrice, tx)
+
 		return nil
 	} else {
 		// 出库完成后，要将该批次库存清零
@@ -8965,6 +8967,7 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 	}
 	CreatedDialysisPrepare(autoMatic, tx)
 	dialyPrepareOne.Count = deliver_number - stock_number
+	ModifyGoodPakingPrice(goods.GoodId, warehouse.PackingPrice, tx)
 	ConsumableNewHisPrescriptionDelivery(orgID, patient_id, record_time, dialyPrepareOne, warehouseOut, creator, tx)
 
 	return nil
@@ -8981,6 +8984,18 @@ func CreatedDialysisPrepare(prepare *models.AutomaticReduceDetail, tx *gorm.DB)
 	return err
 }
 
+func ModifyGoodPakingPrice(good_id int64, packing_price float64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.GoodInfo{}).Where("id = ? and status=1", good_id).Updates(map[string]interface{}{"packing_price": packing_price}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func NewHisGoodCancelInfo(orgID int64, creater int64, project *models.HisPrescriptionProject, cha_count int64, good models.GoodInformationThirty, tx *gorm.DB) (err error) {
 
 	storeConfig, _ := GetNewAllStoreHouseConfig(orgID, tx)