耗材参数

controllers/base_api_controller.go

@@ -95,8 +95,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		//adminUserInfo.Subscibes = subscibes
 		//this.SetSession("admin_user_info", &adminUserInfo)
 
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 

controllers/dialysis_api_controller.go

@@ -327,11 +327,11 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -656,11 +656,11 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisIrrigation:       dialysis_irrigation,
-		DialysisDialyszers:       dialysis_dialyszers,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                     blood,
+		DialysisIrrigation:        dialysis_irrigation,
+		DialysisDialyszers:        dialysis_dialyszers,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
+		DisplaceSpeed:             displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1100,7 +1100,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fmt.Println("丰管业配置", data.SealingFluidDispose)
+
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 	assessment.DialysisOrderId = data.DialysisOrderId
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
@@ -1163,6 +1163,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.DiastolicPressure = data.DiastolicPressure
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
+	assessment.Ktv = data.Ktv
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -3010,12 +3011,13 @@ func (c *DialysisApiController) GetSchedule() {
 	schedual_type, _ := c.GetInt64("schedual_type")
 	adminUserInfo := c.GetAdminUserInfo()
 
-	timeLayout := "2006-01-02 15:04:05"
-
-	date := time.Now().Format("2006-01-02") + " 00:00:00"
-	loc, _ := time.LoadLocation("Local")
-	theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
-	scheduleTime := theStartTime.Unix()
+	//timeLayout := "2006-01-02 15:04:05"
+	//
+	//date := time.Now().Format("2006-01-02") + " 00:00:00"
+	//loc, _ := time.LoadLocation("Local")
+	//theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
+	//scheduleTime := theStartTime.Unix()
+	scheduleTime, _ := c.GetInt64("record_date")
 
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.CurrentOrgId, scheduleTime, schedual_type)
 

controllers/dialysis_record_api_controller.go

@@ -553,6 +553,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 func (this *DialysisRecordAPIController) StartDialysis() {
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
+	fmt.Println("上机日期222222222222222222222222", recordDateStr)
 	nurseID, _ := this.GetInt64("nurse")
 	punctureNurseId, _ := this.GetInt64("puncture_nurse")
 	startDateStr := this.GetString("start_time")

controllers/gobal_config_api_controller.go

@@ -84,7 +84,7 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/monitor/getmonitorconfig", &GobalConfigApiController{}, "Get:GetMonitorConfig")
 	beego.Router("/api/order/addorderconfig", &GobalConfigApiController{}, "Get:AddOrderConfig")
 	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
-
+	beego.Router("/api/drugstock/getdrugautomaticlist", &GobalConfigApiController{}, "Get:GetDrugAutoMaticList")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1700,3 +1700,24 @@ func (c *GobalConfigApiController) GetOrderConfig() {
 		"config": config,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugAutoMaticList() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	warehous_out_id, _ := c.GetInt64("warehous_out_id")
+	record_time, _ := c.GetInt64("record_time")
+	warehouse_out_order_number := c.GetString("warehouse_out_order_number")
+	drugConfig, _ := service.GetDrugStockConfig(orgId)
+	list, err := service.GetDrugAutoMaticList(orgId, warehous_out_id, record_time, warehouse_out_order_number)
+	drugList, err := service.GetAllBaseDrugList(orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"drugConfig": drugConfig,
+		"drugList":   drugList,
+	})
+}

controllers/his_api_controller.go

@@ -414,6 +414,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					utils.ErrorLog("pre_time")
 				}
 				preTime, _ := items["pre_time"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
@@ -442,6 +443,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					PrescriptionNumber: hpInfo.PrescriptionNumber,
 					PreTime:            pTime,
 				}
+
 				service.SaveHisPrescription(prescription)
 
 				//更改患者挂号状态
@@ -465,17 +467,19 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
 							s.RecordDate = recordDateTime
-							s.StartTime = prescription.PreTime
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
 							s.PatientId = patient_id
 							s.HisPatientId = his_patient_id
+							s.StartTime = pTime
 							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
+
+							s.StartTime = pTime
 							service.CreateHisDoctorAdvice(&s)
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
@@ -2818,7 +2822,7 @@ func (c *HisApiController) PostProjectInformation() {
 	var projectList []*models.HisProject
 	var total_goods []interface{}
 	tempProjects := dataBody["projects"].([]interface{})
-	fmt.Println("666666666666", tempProjects)
+
 	total_goods = tempProjects
 	for index, projectMap := range tempProjects {
 
@@ -2876,7 +2880,7 @@ func (c *HisApiController) PostProjectInformation() {
 			err_log := models.ExportErrLog{
 				LogType:    6,
 				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的单位不能为空或内容与系统不匹配",
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的单位不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2892,7 +2896,7 @@ func (c *HisApiController) PostProjectInformation() {
 			err_log := models.ExportErrLog{
 				LogType:    6,
 				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的费用类别不能为空或内容与系统不匹配",
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的费用类别不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2909,13 +2913,14 @@ func (c *HisApiController) PostProjectInformation() {
 		if len(cost_classify) != 0 {
 			_, errcode := service.IsExistDicConfig(costClassifyConfig.ID, cost_classify, orgId)
 			if errcode == gorm.ErrRecordNotFound {
+				costConfig, _ := service.GetLastDicConfig(costClassifyConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       costClassifyConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           cost_classify,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          costConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2978,7 +2983,7 @@ func (c *HisApiController) PostProjectInformation() {
 		project.ExecutiveSection = executive_section_id
 
 		medical_coverage := projectM["medical_coverage"].(string)
-		fmt.Println("3333333333333", medical_coverage)
+
 		if len(medical_coverage) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    6,
@@ -3001,13 +3006,14 @@ func (c *HisApiController) PostProjectInformation() {
 
 			_, errormedicalcoverage := service.IsExistDicConfig(medicalCoverageConfig.ID, medical_coverage, orgId)
 			if errormedicalcoverage == gorm.ErrRecordNotFound {
+				medicalCoverageConfig, _ := service.GetLastDicConfig(medicalCoverageConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       medicalCoverageConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           medical_coverage,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          medicalCoverageConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3034,7 +3040,7 @@ func (c *HisApiController) PostProjectInformation() {
 		project.Pinyin = pinyin
 
 		wubi := projectM["wubi"].(string)
-		fmt.Println("五笔333333333333333333333333333333", wubi)
+
 		project.Wubi = wubi
 
 		statistical_classification := projectM["statistical_classification"].(string)
@@ -3047,13 +3053,14 @@ func (c *HisApiController) PostProjectInformation() {
 			_, classificationerrcodes := service.IsExistDicConfig(classiFication.ID, statistical_classification, orgId)
 
 			if classificationerrcodes == gorm.ErrRecordNotFound {
+				classiFicationConfig, _ := service.GetLastDicConfig(classiFication.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       classiFication.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           statistical_classification,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          classiFicationConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3097,13 +3104,14 @@ func (c *HisApiController) PostProjectInformation() {
 		if len(tube_color) != 0 {
 			_, errcodetube := service.IsExistDicConfig(tubeColorConfig.ID, tube_color, orgId)
 			if errcodetube == gorm.ErrRecordNotFound {
+				tubeConfig, _ := service.GetLastDicConfig(tubeColorConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       tubeColorConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           tube_color,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          tubeConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3153,14 +3161,14 @@ func (c *HisApiController) PostProjectInformation() {
 		project.SpecailProject = specail_project
 
 		social_security_directory_code := projectM["social_security_directory_code"].(string)
-		fmt.Println("社保目录编码22222222222", social_security_directory_code)
+
 		project.SocialSecurityDirectoryCode = social_security_directory_code
 
 		remark := projectM["remark"].(string)
 		project.Remark = remark
 
 		record_date := projectM["record_date"].(string)
-		fmt.Println("日期222222222", record_date)
+
 		timeLayout := "2006-01-02"
 		loc, _ := time.LoadLocation("Local")
 
@@ -3171,7 +3179,7 @@ func (c *HisApiController) PostProjectInformation() {
 
 	export_time := time.Now().Unix()
 
-	errLogs, _ := service.FindPatientExportLog(c.GetAdminUserInfo().CurrentOrgId, export_time)
+	errLogs, _ := service.FindPatientExportLogThree(c.GetAdminUserInfo().CurrentOrgId, export_time)
 	if len(projectList) > 0 {
 		for _, item := range projectList {
 			project := models.HisProject{

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -846,6 +846,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	supine_diastolic_blood_pressure := c.GetString("supine_diastolic_blood_pressure")
 	diastolic_pressure := c.GetString("diastolic_pressure")
 	other_complication := c.GetString("other_complication")
+	ktv := c.GetString("ktv")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -938,6 +939,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		SettingPressure:              setting_pressure,
 		DiastolicPressure:            diastolic_pressure,
 		OtherComplication:            other_complication,
+		Ktv:                          ktv,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -3075,13 +3077,13 @@ func (c *DialysisAPIController) GetSchedule() {
 	schedual_type, _ := c.GetInt64("schedual_type")
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
-	timeLayout := "2006-01-02 15:04:05"
-
-	date := time.Now().Format("2006-01-02") + " 00:00:00"
-	loc, _ := time.LoadLocation("Local")
-	theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
-	scheduleTime := theStartTime.Unix()
-
+	//timeLayout := "2006-01-02 15:04:05"
+	//
+	//date := time.Now().Format("2006-01-02") + " 00:00:00"
+	//loc, _ := time.LoadLocation("Local")
+	//theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
+	//scheduleTime := theStartTime.Unix()
+	scheduleTime, _ := c.GetInt64("record_date")
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.Org.Id, scheduleTime, schedual_type)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -3553,6 +3555,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 
 			goods, _ := dataBody["goods"].([]interface{})
+			fmt.Println("goods2222222222222", goods)
 			if len(goods) > 0 {
 				for _, item := range goods {
 					items := item.(map[string]interface{})
@@ -3636,7 +3639,7 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 			}
 		}
-
+		fmt.Println("hhhhhhhhhhhhhhhhhhhh", beforePrepares)
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
@@ -3696,6 +3699,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+		fmt.Println("是否有出库单22222222222222222222222", err)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -3800,6 +3804,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						if err == nil {
 
 							count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+
 							if count == 0 {
 								details := &models.AutomaticReduceDetail{
 									WarehouseOutId:          warehouseOutInfo.ID,
@@ -3826,6 +3831,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						}
 
 						count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+
 						if count == 0 {
 							details := &models.AutomaticReduceDetail{
 								WarehouseOutId:          outInfo.ID,
@@ -3842,6 +3848,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
 						} else if count == 1 {
+							fmt.Println("llllllllllllllllllllll")
 							service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 						}
 						//details := &models.AutomaticReduceDetail{
@@ -3864,7 +3871,9 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 
 			if len(beforePrepares) > 0 { //修改
+
 				for _, consumable := range consumables_source {
+
 					for _, before := range beforePrepares {
 
 						if consumable.GoodId == before.GoodId {
@@ -3874,6 +3883,7 @@ func (c *DialysisAPIController) EditConsumables() {
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
+								fmt.Println("err222222222222222222", err)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
 
 									warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3895,6 +3905,7 @@ func (c *DialysisAPIController) EditConsumables() {
 									warehouseOutInfo.GoodId = before.GoodId
 									warehouseOutInfo.GoodTypeId = before.GoodTypeId
 									err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+									fmt.Println("err2223444444444444444444", err)
 									if err == nil {
 										//可能存在商品使用人不存在的情况，需要先判断商品使用人是否存在
 										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, record_time)
@@ -3953,6 +3964,7 @@ func (c *DialysisAPIController) EditConsumables() {
 												GoodTypeId:              consumable.GoodTypeId,
 												Count:                   before.Count,
 											}
+
 											service.AddSigleAutoReduceRecordInfo(details)
 										} else if err == nil {
 											if user.ID > 0 {
@@ -3969,10 +3981,23 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 		}
 
+		//更新自动出库的地方
 		var errs error
 		if len(beforePrepares) > 0 {
+
 			for _, item := range beforePrepares {
 				errs = service.UpdateDialysisBeforePrepareTwo(item)
+
+				detail := models.AutomaticReduceDetail{
+					PatientId:  item.PatientId,
+					Status:     1,
+					RecordTime: item.RecordDate,
+					OrgId:      item.UserOrgId,
+					GoodId:     item.GoodId,
+					GoodTypeId: item.GoodTypeId,
+					Count:      item.Count,
+				}
+				service.UpdateAutoReduceDetailSix(&detail)
 			}
 		}
 		if errs == nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1242,6 +1242,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
 	groupno, _ := c.GetInt64("groupno", -1)
+
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
@@ -1312,10 +1313,21 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	var err error
 	if groupno > 0 {
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+
 	} else {
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
 	}
 
+	//判断是否开启his
+	errs, config := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
+	//如果开启去修改执行时间
+	if config.IsOpen == 1 {
+		advicesinfo := models.HisDoctorAdviceInfo{
+			ExecutionTime: theTime.Unix(),
+			UpdatedTime:   time.Now().Unix(),
+		}
+		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return

controllers/schedule_api_controller.go

@@ -1317,13 +1317,30 @@ func (this *ScheduleApiController) ExportSchedule() {
 		errLogs, _ := service.FindSchedualExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
 		if len(schedules) > 0 {
-			schedule_date := time.Now().Format("2006-01-02")
-			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
-			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
+			//schedule_date := time.Now().Format("2006-01-02")
+			//date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
+			//clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
+			//err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
-					service.CreateSchedule(item)
+					//查找当天日期是否存在
+					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId)
+					if errcode == gorm.ErrRecordNotFound {
+						service.CreateSchedule(item)
+					} else if errcode == nil {
+						schedule := models.XtSchedule{
+							PartitionId:  item.PartitionId,
+							BedId:        item.BedId,
+							PatientId:    item.PatientId,
+							ScheduleDate: item.ScheduleDate,
+							ScheduleType: item.ScheduleType,
+							ScheduleWeek: item.ScheduleWeek,
+							ModeId:       item.ModeId,
+							Status:       1,
+						}
+						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
+					}
+
 				}
 
 				log := models.ExportLog{

controllers/stock_in_api_controller.go

@@ -72,6 +72,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/postgoodinformation", &StockManagerApiController{}, "Post:AddGoodInformation")
 
 	beego.Router("/api/good/postdruginformation", &StockManagerApiController{}, "Post:AddDrugInformation")
+
+	beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -2076,14 +2078,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		if len(good_kind) != 0 {
 			_, errcodegoodkind := service.IsExistDicConfig(config.ID, good_kind, orgId)
-
+			lastConfig, _ := service.GetLastDicConfig(config.ID, orgId)
 			dataconfig := models.DictDataconfig{
 				ParentId:       config.ID,
 				Module:         "system",
 				OrgId:          orgId,
 				Name:           good_kind,
 				FieldName:      "",
-				Value:          index + 50,
+				Value:          lastConfig.Value + 1,
 				CreatedTime:    "",
 				UpdatedTime:    "",
 				CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2175,13 +2177,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 		if len(medical_insurance_level) != 0 {
 			_, errcodemedicalInsurance := service.IsExistDicConfig(medicalInsuranceDataConfig.ID, medical_insurance_level, orgId)
 			if errcodemedicalInsurance == gorm.ErrRecordNotFound {
+				mediConfigOne, _ := service.GetLastDicConfig(medicalInsuranceDataConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       medicalInsuranceDataConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           medical_insurance_level,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          mediConfigOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2329,7 +2332,8 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		var dealer_id int64
 		dealerName := goodNameM["dealer"].(string)
-		fmt.Println("经销商33333333", dealerName)
+
+		fmt.Println("经销商", dealerName)
 		dealer := models.Dealer{
 			OrgId:      orgId,
 			Status:     1,
@@ -2435,13 +2439,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 			_, errcodecagegory := service.IsExistDicConfig(drugDataConfig.ID, statistics_category, orgId)
 
 			if errcodecagegory == gorm.ErrRecordNotFound {
+				dicConfigThree, _ := service.GetLastDicConfig(drugDataConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugDataConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           statistics_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          dicConfigThree.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2474,23 +2479,23 @@ func (this *StockManagerApiController) AddGoodInformation() {
 	}
 
 	export_time := time.Now().Unix()
-	errLogs, _ := service.FindPatientExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
+	errLogs, _ := service.FindPatientExportLogTwo(this.GetAdminUserInfo().CurrentOrgId, export_time)
 	if len(goods) > 0 {
 
 		for _, item := range goods {
 
 			goodInfo := models.GoodInfo{
-				GoodName:          item.GoodName,
-				SpecificationName: item.SpecificationName,
-				GoodKind:          item.GoodKind,
-				GoodTypeId:        item.GoodTypeId,
-				Dealer:            item.Dealer,
-				GoodUnit:          item.GoodUnit,
-				IsRecord:          item.IsRecord,
-				IsSpecialDiseases: item.IsSpecialDiseases,
-				Manufacturer:      item.Manufacturer,
-				Pinyin:            item.Pinyin,
-
+				GoodName:                    item.GoodName,
+				SpecificationName:           item.SpecificationName,
+				GoodKind:                    item.GoodKind,
+				GoodTypeId:                  item.GoodTypeId,
+				Dealer:                      item.Dealer,
+				GoodUnit:                    item.GoodUnit,
+				IsRecord:                    item.IsRecord,
+				IsSpecialDiseases:           item.IsSpecialDiseases,
+				Manufacturer:                item.Manufacturer,
+				Pinyin:                      item.Pinyin,
+				GoodStatus:                  item.GoodStatus,
 				ProductionType:              item.ProductionType,
 				Remark:                      item.Remark,
 				RetailPrice:                 item.RetailPrice,
@@ -2575,6 +2580,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 	total_goods = tempDrugs
 	for index, drugMap := range tempDrugs {
+
 		goodNameM := drugMap.(map[string]interface{})
 		var drug models.BaseDrugLib
 		if goodNameM["drug_name"] == nil || reflect.TypeOf(goodNameM["drug_name"]).String() != "string" {
@@ -2644,16 +2650,19 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drugType = "药品类型"
 
 		drugconfig, _ := service.GetDrugDataConfig(0, drugType)
-		if len(drug_type) == 0 {
-			_, errcodes := service.IsExistDicConfig(drugconfig.ParentId, drug_type, orgId)
+		if len(drug_type) != 0 {
+			_, errcodes := service.IsExistDicConfig(drugconfig.ID, drug_type, orgId)
 			if errcodes == gorm.ErrRecordNotFound {
+				//获取该型号最后一条数据型号
+				config, _ := service.GetLastDicConfig(drugconfig.ID, orgId)
+
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugconfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_type,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          config.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2713,7 +2722,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.DrugOriginPlace = drug_origin_place
 
 		drug_dosage_form := goodNameM["drug_dosage_form"].(string)
-		fmt.Println("药品剂型2222222222", drug_dosage_form)
+
 		if len(drug_dosage_form) == 0 {
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -2734,13 +2743,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drug_dosage_form) != 0 {
 			_, errcodess := service.IsExistDicConfig(drugDosageconfig.ID, drug_dosage_form, orgId)
 			if errcodess == gorm.ErrRecordNotFound {
+				configOne, _ := service.GetLastDicConfig(drugDosageconfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugDosageconfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
-					Name:           drug_dosage,
+					Name:           drug_dosage_form,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          configOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2762,12 +2772,12 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				drug_dosage_form_id = int64(it.Value)
 			}
 		}
-		fmt.Println("hhhhhhh66666666666666", drug_dosage_form_id)
+
 		drug.DrugDosageForm = drug_dosage_form_id
 
 		medical_insurance_level := goodNameM["medical_insurance_level"].(string)
 		var medical_insurance_level_id int64
-		if len(medical_insurance_level) <= 0 { //名字为空则生成一条导入错误日志
+		if len(medical_insurance_level) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2785,13 +2795,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(medical_insurance_level) != 0 {
 			_, errcodemedical := service.IsExistDicConfig(medicalInsuranceConfig.ID, medical_insurance_level, orgId)
 			if errcodemedical == gorm.ErrRecordNotFound {
+				medConfig, _ := service.GetLastDicConfig(medicalInsuranceConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       medicalInsuranceConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           medical_insurance_level,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          medConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2921,17 +2932,18 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drugClassify = "药物分类"
 		var drug_classify_id int64
 		drugClassifyConfig, _ := service.GetDrugDataConfig(0, drugClassify)
-		fmt.Println("9999999999999999999", drugClassifyConfig)
+
 		if len(drug_classify) != 0 {
 			_, errcodesClass := service.IsExistDicConfig(drugClassifyConfig.ID, drug_classify, orgId)
 			if errcodesClass == gorm.ErrRecordNotFound {
+				drugClassConfig, _ := service.GetLastDicConfig(drugClassifyConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugClassifyConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_classify,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugClassConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2996,17 +3008,20 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Manufacturer = manufacturer_id
 
 		dealer := goodNameM["dealer"].(string)
-		_, errcodesdealer := service.GetDealerByName(orgId, dealer)
-		if errcodesdealer == gorm.ErrRecordNotFound {
-			dealerconfig := models.Dealer{
-				DealerName: dealer,
-				Status:     1,
-				OrgId:      orgId,
-				Ctime:      time.Now().Unix(),
-				Creater:    adminUser.AdminUser.Id,
+		if len(dealer) != 0 {
+			_, errcodesdealer := service.GetDealerByName(orgId, dealer)
+			if errcodesdealer == gorm.ErrRecordNotFound {
+				dealerconfig := models.Dealer{
+					DealerName: dealer,
+					Status:     1,
+					OrgId:      orgId,
+					Ctime:      time.Now().Unix(),
+					Creater:    adminUser.AdminUser.Id,
+				}
+				service.CreateDealer(&dealerconfig)
 			}
-			service.CreateDealer(&dealerconfig)
 		}
+
 		var dealer_id int64
 		dealerList, _ := service.GetAllDealerList(orgId)
 		for _, it := range dealerList {
@@ -3034,14 +3049,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(statistics_category) != 0 {
 			_, errcodestatistc := service.IsExistDicConfig(statistcConfig.ID, statistics_category, orgId)
 			if errcodestatistc == gorm.ErrRecordNotFound {
-
+				staConfig, _ := service.GetLastDicConfig(statistcConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       statistcConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           statistics_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          staConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3081,13 +3096,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(pharmacology_category) != 0 {
 			_, errcodespharmacology := service.IsExistDicConfig(pharmacologyConfig.ID, pharmacology_category, orgId)
 			if errcodespharmacology == gorm.ErrRecordNotFound {
+				dicConfig, _ := service.GetLastDicConfig(pharmacologyConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       pharmacologyConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           pharmacology_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          dicConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3147,13 +3163,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drug_control) != 0 {
 			_, errcodesdrugcontrol := service.IsExistDicConfig(drugContorlConfig.ID, drug_control, orgId)
 			if errcodesdrugcontrol == gorm.ErrRecordNotFound {
+				drugContorlConfigOne, _ := service.GetLastDicConfig(drugContorlConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugContorlConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_control,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugContorlConfigOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3183,17 +3200,18 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drug_category_id int64
 
 		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
-		fmt.Println("33333drugCategoryConfig", drugCategoryConfig)
+
 		if len(drug_category) != 0 {
 			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
 			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
+				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugCategoryConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugCategoryConfigSix.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3259,13 +3277,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drugDoseUnit) != 0 {
 			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
 			if errcodedataconfig == gorm.ErrRecordNotFound {
+				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
 				dataconfig := models.Dataconfig{
 					ParentId:       dataConfig.ID,
 					Module:         "hemodialysis",
 					OrgId:          orgId,
 					Name:           drugDoseUnit,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          childConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3296,8 +3315,8 @@ func (this *StockManagerApiController) AddDrugInformation() {
 	}
 
 	export_time := time.Now().Unix()
-	errLogs, _ := service.FindPatientExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
-	fmt.Println("数组", drugList)
+	errLogs, _ := service.FindPatientExportLogOne(this.GetAdminUserInfo().CurrentOrgId, export_time)
+
 	if len(drugList) > 0 {
 		for _, item := range drugList {
 
@@ -3395,3 +3414,64 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		})
 	}
 }
+
+func (this *StockManagerApiController) GetInitializtion() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var drugCategory = "药品类别"
+	var drugType = "药品类型"
+	var drugDosageForm = "药品剂型"
+	var medicalInsuranceLevel = "医保等级"
+	var drugControl = "开药控制"
+	var drugClassify = "药物分类"
+	var statisticsCategory = "统计分类"
+	var pharmacologyCategory = "药理分类"
+	var goodKind = "耗材种类"
+	var tubeColor = "试管颜色"
+	var costClassify = "费用类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	drugCategoryParent, _ := service.GetDrugDataConfig(0, drugCategory)
+	drugCategoryList, _ := service.GetParentDataConfig(drugCategoryParent.ID, orgId)
+
+	drugDosageFormParent, _ := service.GetDrugDataConfig(0, drugDosageForm)
+	drugDosageFormList, _ := service.GetParentDataConfig(drugDosageFormParent.ID, orgId)
+
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
+
+	drugControlParent, _ := service.GetDrugDataConfig(0, drugControl)
+	drugControlList, _ := service.GetParentDataConfig(drugControlParent.ID, orgId)
+
+	drugClassifyParent, _ := service.GetDrugDataConfig(0, drugClassify)
+	drugClassifyList, _ := service.GetParentDataConfig(drugClassifyParent.ID, orgId)
+
+	statisticsCategoryParent, _ := service.GetDrugDataConfig(0, statisticsCategory)
+	statisticsCategoryList, _ := service.GetParentDataConfig(statisticsCategoryParent.ID, orgId)
+
+	pharmacologyCategoryParent, _ := service.GetDrugDataConfig(0, pharmacologyCategory)
+	pharmacologyCategoryList, _ := service.GetParentDataConfig(pharmacologyCategoryParent.ID, orgId)
+
+	goodKindParent, _ := service.GetDrugDataConfig(0, goodKind)
+	goodKindList, _ := service.GetParentDataConfig(goodKindParent.ID, orgId)
+
+	tubeColorParent, _ := service.GetDrugDataConfig(0, tubeColor)
+	tubeColorList, _ := service.GetParentDataConfig(tubeColorParent.ID, orgId)
+
+	costClassifyParent, _ := service.GetDrugDataConfig(0, costClassify)
+	costClassifyList, _ := service.GetParentDataConfig(costClassifyParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugCategoryList":          drugCategoryList,
+		"drugTypeList":              drugTypeList,
+		"drugDosageFormList":        drugDosageFormList,
+		"medicalInsuranceLevelList": medicalInsuranceLevelList,
+		"drugControlList":           drugControlList,
+		"drugClassifyList":          drugClassifyList,
+		"statisticsCategoryList":    statisticsCategoryList,
+		"pharmacologyCategoryList":  pharmacologyCategoryList,
+		"goodKindList":              goodKindList,
+		"tubeColorList":             tubeColorList,
+		"costClassifyList":          costClassifyList,
+	})
+}

models/dialysis.go

@@ -585,6 +585,7 @@ type AssessmentAfterDislysis struct {
 	SupineDiastolicBloodPressure    string  `gorm:"column:supine_diastolic_blood_pressure" json:"supine_diastolic_blood_pressure" form:"supine_diastolic_blood_pressure"`
 	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
 	OtherComplication               string  `gorm:"column:other_complication" json:"other_complication" form:"other_complication"`
+	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/drug_stock.go

@@ -215,3 +215,13 @@ type DrugAutomaticReduceDetail struct {
 func (DrugAutomaticReduceDetail) TableName() string {
 	return "xt_drug_automatic_reduce_detail"
 }
+
+type VmDrugAutomaticReduceDetail struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Total                   int64
+}

service/dialysis_service.go

@@ -1093,12 +1093,18 @@ func UpdateDialysisBeforePrepare(info *models.DialysisBeforePrepare) (err error)
 
 func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err error) {
 	err = writeDb.Model(&models.DialysisBeforePrepare{}).
-		Where("status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
-		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier, "commdity_code": info.CommdityCode}).Error
+		Where("status = 1 and good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
+		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier, "commdity_code": info.CommdityCode, "status": 1}).Error
 
 	return err
 }
 
+func UpdateAutoReduceDetailSix(detail *models.AutomaticReduceDetail) (err error) {
+
+	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
+	return err
+}
+
 func UpdateOrderCountSub(good_type_id int64, good_id int64, number string, org_id int64, count int64) {
 	writeDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, number).UpdateColumn("count", gorm.Expr("count - ?", count))
 
@@ -1110,7 +1116,7 @@ func UpdateOrderCountAdd(good_type_id int64, good_id int64, number string, org_i
 }
 
 func UpdateUserInfoDetails(good_type_id int64, good_id int64, time int64, org_id int64, patient_id int64, count int64, out *models.WarehouseOutInfo) {
-	writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count})
+	writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count, "status": 1})
 	//writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber).UpdateColumn("count", count)
 
 }
@@ -1173,3 +1179,20 @@ func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error
 	err := XTReadDB().Create(&prepare).Error
 	return err
 }
+
+func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (err error) {
+
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	err = ut.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1   AND parent_id IN (?) AND execution_state = 1 ", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+	return err
+}

service/gobal_config_service.go

@@ -459,3 +459,17 @@ func GetMonitorConfigById(orgid int64) (*models.XtMonitorConfig, error) {
 	}
 	return &config, nil
 }
+
+func GetDrugAutoMaticList(orgid int64, warehouse_out_id int64, record_time int64, warehouse_out_order_number string) (auto []*models.VmDrugAutomaticReduceDetail, err error) {
+
+	db := XTReadDB().Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
+	err = db.Select("x.org_id,x.warehouse_out_id,x.record_time,x.drug_id,sum(x.count) as total").Where("x.org_id = ?  and x.record_time = ? and x.status= 1 and x.warehouse_out_order_number = ?", orgid, record_time, warehouse_out_order_number).Group("x.drug_id").Scan(&auto).Error
+	return auto, err
+
+}
+
+func GetAllBaseDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
+	return drug, err
+}

service/his_project_service.go

@@ -47,7 +47,7 @@ func GetHisProjectList(orgid int64, limit int64, page int64, charge int64, start
 	if isMark > 0 {
 		db = db.Where("x.is_mark = ?", isMark)
 	}
-	err = db.Select("x.id,x.project_name,x.pinyin,x.wubi,x.price,x.unit,x.cost_classify,x.executive_section,x.medical_coverage,x.statistical_classification,x.disease_directory,x.is_record,x.medical_code,x.tube_color,x.medical_status,x.remark,x.sign,x.default_number,x.is_default,x.is_charge,x.is_estimate,x.is_workload,x.sort,x.doctor_advice,x.user_org_id,x.status,x.created_time,x.is_mark").Count(&total).Offset(offset).Limit(limit).Find(&hisproject).Error
+	err = db.Select("x.id,x.project_name,x.pinyin,x.wubi,x.price,x.unit,x.cost_classify,x.executive_section,x.medical_coverage,x.statistical_classification,x.disease_directory,x.is_record,x.medical_code,x.tube_color,x.medical_status,x.remark,x.sign,x.default_number,x.is_default,x.is_charge,x.is_estimate,x.is_workload,x.sort,x.doctor_advice,x.user_org_id,x.status,x.created_time,x.is_mark").Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&hisproject).Error
 	return hisproject, total, err
 }
 

service/patient_service.go

@@ -1394,6 +1394,21 @@ func FindPatientExportLog(org_id int64, export_time int64) (errLogs []*models.Ex
 	return
 }
 
+func FindPatientExportLogOne(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 4", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
+func FindPatientExportLogTwo(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 5", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
+func FindPatientExportLogThree(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 6", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
 func CreateExportLog(log *models.ExportLog) {
 	writeDb.Create(&log)
 }

service/schedule_service.go

@@ -133,6 +133,24 @@ func CreateSchedule(m *models.Schedule) error {
 	return writeDb.Model(&models.Schedule{}).Create(&m).Error
 }
 
+func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*models.XtSchedule, error) {
+	var scheudle models.XtSchedule
+	var err error
+	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, schedudate, orgid).Find(&scheudle).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &scheudle, nil
+}
+
+func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
 func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 	var schedule models.Schedule
 	var err error

service/self_drug_service.go

@@ -500,7 +500,7 @@ func CreateAotoMaticReduceDetail(detail *models.XtDrugAutomaticReduceDetail) err
 func GetDrugStockConfig(orgid int64) (models.XtDrugStockConfig, error) {
 
 	config := models.XtDrugStockConfig{}
-	err := XTReadDB().Model(&config).Where("org_id =? and status = 1", orgid).Find(&orgid).Error
+	err := XTReadDB().Model(&config).Where("org_id =? and status = 1", orgid).Find(&config).Error
 	return config, err
 }
 

service/stock_service.go

@@ -969,6 +969,7 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 		likeKey := "%" + keywords + "%"
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_drug_warehouse_out.creater")
 		db = db.Joins("join xt_manufacturer on xt_manufacturer.id = xt_drug_warehouse_out.manufacturer")
+
 		db = db.Where("xt_manufacturer.manufacturer_name LIKE ? OR sgj_user_admin_role.user_name LIKE ? OR xt_drug_warehouse_out.warehouse_out_order_number LIKE ?", likeKey, likeKey, likeKey).Group("xt_drug_warehouse_out.id")
 	}
 
@@ -2110,7 +2111,7 @@ func UpdateDrugStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
 
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ?AND status = 1  AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
 	return
 
 }
@@ -2289,7 +2290,7 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
-	err = XTReadDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and status =1", drugname, drugdesc).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and status =1 and org_id = ?", drugname, drugdesc, orgid).Find(&drug).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2408,6 +2409,13 @@ func IsExistDicConfig(parentid int64, goodKind string, orgid int64) (*models.Dic
 	return &dataconfig, nil
 }
 
+func GetLastDicConfig(parentid int64, orgid int64) (models.DictDataconfig, error) {
+
+	dataconfig := models.DictDataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("parent_id = ? and (org_id = ? or org_id = 0) and status = 1", parentid, orgid).Last(&dataconfig).Error
+	return dataconfig, err
+}
+
 func CreatedDicConfig(dataconfig *models.DictDataconfig) error {
 
 	err := XTWriteDB().Create(&dataconfig).Error
@@ -2480,6 +2488,13 @@ func GetChildeConfigIsExist(parentid int64, name string, orgid int64) (*models.D
 	return &dataconfig, nil
 }
 
+func GetLastChildeConfig(parentid int64, orgid int64) (models.Dataconfig, error) {
+
+	dataconfig := models.Dataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("parent_id = ? and (org_id = ? or org_id = 0) and status =1", parentid, orgid).Last(&dataconfig).Error
+	return dataconfig, err
+}
+
 func CreateDataConfig(dataconfig *models.Dataconfig) error {
 
 	err := XTWriteDB().Create(&dataconfig).Error