耗材参数

conf/app.conf

 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true

controllers/dialysis_record_api_controller.go

 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院

controllers/drug_stock_api_contorller.go

 		Manufacturer:     manufacturer_id,
 	}
 
-	service.EditDrugWarehousing(warehousing)
+	service.EditDrugWarehousingOne(warehousing, id)
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {

controllers/his_api_controller.go

 //}
 
 func (c *HisApiController) PostProjectInformation() {
-
+	adminUser := c.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
 	var projectList []*models.HisProject
 	var total_goods []interface{}
 	tempProjects := dataBody["projects"].([]interface{})
-
+	fmt.Println("666666666666", tempProjects)
 	total_goods = tempProjects
 	for index, projectMap := range tempProjects {
 
 
 		project.ProjectName = project_name
 
-		price := projectM["price"].(float64)
+		prices := projectM["price"].(string)
 
+		price, _ := strconv.ParseFloat(prices, 64)
 		if price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    6,
 			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(),
 		}
 		project.Unit = unit
 
-		if projectM["cost_classify_id"] == nil || reflect.TypeOf(projectM["cost_classify_id"]).String() != "float64" {
-			utils.ErrorLog("cost_classify_id")
-			return
-		}
-
-		cost_classify_id := int64(projectM["cost_classify_id"].(float64))
-		if cost_classify_id <= 0 { //名字为空则生成一条导入错误日志
+		cost_classify := projectM["cost_classify"].(string)
+		if len(cost_classify) == 0 { //名字为空则生成一条导入错误日志
 			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(),
 			service.CreateExportErrLog(&err_log)
 			continue
 		}
+		var costClassify = "费用类别"
+		var cost_classify_id int64
+
+		costClassifyConfig, _ := service.GetDrugDataConfig(0, costClassify)
+
+		if len(cost_classify) != 0 {
+			_, errcode := service.IsExistDicConfig(costClassifyConfig.ID, cost_classify, orgId)
+			if errcode == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       costClassifyConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           cost_classify,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+
+		costClassList, _ := service.GetParentDataConfig(costClassifyConfig.ID, orgId)
+
+		for _, it := range costClassList {
+			if cost_classify == it.Name {
+				cost_classify_id = int64(it.Value)
+			}
+		}
 		project.CostClassify = cost_classify_id
-		executive_section_id := int64(projectM["executive_section_id"].(float64))
-		if executive_section_id <= 0 { //名字为空则生成一条导入错误日志
+
+		executive_section := projectM["executive_section"].(string)
+		if len(executive_section) == 0 { //名字为空则生成一条导入错误日志
 			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(),
 			continue
 		}
 
-		project.ExecutiveSection = executive_section_id
-
-		if projectM["medical_insurance_level_id"] == nil || reflect.TypeOf(projectM["medical_insurance_level_id"]).String() != "float64" {
-			utils.ErrorLog("medical_insurance_level_id")
-			return
+		if len(executive_section) != 0 {
+			//查找科室是否有内容
+			_, errcodedepart := service.GetDepartMentByName(executive_section, orgId)
+			if errcodedepart == gorm.ErrRecordNotFound {
+				department := models.XtHisDepartment{
+					Name:        executive_section,
+					Status:      1,
+					UserOrgId:   adminUser.CurrentOrgId,
+					CreatedTime: time.Now().Unix(),
+				}
+				service.CreateDePartment(&department)
+			}
+		}
+		var executive_section_id int64
+		departMentList, _ := service.GetAllDepartMent(orgId)
+		for _, it := range departMentList {
+			if executive_section == it.Name {
+				executive_section_id = it.ID
+			}
 		}
+		project.ExecutiveSection = executive_section_id
 
-		medical_insurance_level_id := int64(projectM["medical_insurance_level_id"].(float64))
-		if executive_section_id <= 0 { //名字为空则生成一条导入错误日志
+		medical_coverage := projectM["medical_coverage"].(string)
+		fmt.Println("3333333333333", medical_coverage)
+		if len(medical_coverage) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    6,
 				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
 			continue
 		}
 
-		project.MedicalCoverage = medical_insurance_level_id
+		var medicalCoverage = "医保等级"
+		var medical_coverage_id int64
+
+		medicalCoverageConfig, _ := service.GetDrugDataConfig(0, medicalCoverage)
+		if len(medical_coverage) != 0 {
+
+			_, errormedicalcoverage := service.IsExistDicConfig(medicalCoverageConfig.ID, medical_coverage, orgId)
+			if errormedicalcoverage == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       medicalCoverageConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           medical_coverage,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+		medicalCoverageList, _ := service.GetParentDataConfig(medicalCoverageConfig.ID, orgId)
+		for _, it := range medicalCoverageList {
+			if medical_coverage == it.Name {
+				medical_coverage_id = int64(it.Value)
+			}
+		}
+		project.MedicalCoverage = medical_coverage_id
+
+		pinyin := projectM["pinyin"].(string)
+		project.Pinyin = pinyin
+
+		wubi := projectM["wubi"].(string)
+		project.Wubi = wubi
+
+		statistical_classification := projectM["statistical_classification"].(string)
+
+		var statisticalClassification = "统计分类"
+		var statistical_classification_id int64
+		classiFication, _ := service.GetDrugDataConfig(0, statisticalClassification)
+		if len(statistical_classification) != 0 {
+
+			_, classificationerrcodes := service.IsExistDicConfig(classiFication.ID, statistical_classification, orgId)
+
+			if classificationerrcodes == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       classiFication.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           statistical_classification,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
 
+		}
+		classiFicationList, _ := service.GetParentDataConfig(classiFication.ID, orgId)
+
+		for _, it := range classiFicationList {
+			if statistical_classification == it.Name {
+
+				statistical_classification_id = int64(it.Value)
+			}
+		}
+
+		project.StatisticalClassification = statistical_classification_id
+
+		disease_directory := int64(projectM["disease_directory"].(float64))
+		project.DiseaseDirectory = disease_directory
+
+		is_record := int64(projectM["is_record"].(float64))
+		project.IsRecord = is_record
+
+		medical_code := projectM["medical_code"].(string)
+		project.Wubi = medical_code
+
+		tube_color := projectM["tube_color"].(string)
+
+		var tubeColor = "试管颜色"
+		var tube_color_id int64
+		tubeColorConfig, _ := service.GetDrugDataConfig(0, tubeColor)
+		if len(tube_color) != 0 {
+			_, errcodetube := service.IsExistDicConfig(tubeColorConfig.ID, tube_color, orgId)
+			if errcodetube == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       tubeColorConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           tube_color,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+
+		}
+
+		tubeColorList, _ := service.GetParentDataConfig(tubeColorConfig.ID, orgId)
+		for _, it := range tubeColorList {
+			if tube_color == it.Name {
+				tube_color_id = int64(it.Value)
+			}
+		}
+
+		project.TubeColor = tube_color_id
+
+		execution_frequency := projectM["execution_frequency"].(string)
+		project.Wubi = execution_frequency
+
+		delivery_way := projectM["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+
+		number_days := projectM["number_days"].(string)
+		project.NumberDays = number_days
+
+		total := projectM["total"].(string)
+		project.Total = total
+
+		medical_status := int64(projectM["medical_status"].(float64))
+		project.TubeColor = medical_status
+
+		category := int64(projectM["category"].(float64))
+		project.Category = category
+
+		specail_project := int64(projectM["specail_project"].(float64))
+		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 := c.GetString("record_date")
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		project.RecordDate = theTime.Unix()
 		projectList = append(projectList, &project)
 	}
-	adminUser := c.GetAdminUserInfo()
-	orgId := adminUser.CurrentOrgId
+
 	export_time := time.Now().Unix()
+
 	errLogs, _ := service.FindPatientExportLog(c.GetAdminUserInfo().CurrentOrgId, export_time)
 	if len(projectList) > 0 {
 		for _, item := range projectList {

controllers/manager_center_api_controller.go

 	special_medical := c.GetString("special_medical")
 	adminUserInfo := c.GetAdminUserInfo()
 
-	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId, good_id)
+	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
 	if totals > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 32 || template.TemplateId == 34 {
+			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1)
 				record.UltrafiltrationRate = ultrafiltration_rate
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/schedule_api_controller.go

 	//获取本周患者排班
 	schedules, _ := service.GetWeekSchedules(orgId, start_time, end_time)
 
-	//查询复制中的排班日期是否存在
-	_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
-
-	if errcode == gorm.ErrRecordNotFound {
-		//如果没有直接新增
-
-		for _, item := range schedules {
-			//fmt.Println(item.StartTime+604800)
-			//礼拜1
-			if item.ScheduleWeek == 1 {
-				item.ScheduleDate = copy_startime
-			}
-			if item.ScheduleWeek == 2 {
-				item.ScheduleDate = copy_startime + 86400
-			}
-			if item.ScheduleWeek == 3 {
-				item.ScheduleDate = copy_startime + 172800
-			}
-			if item.ScheduleWeek == 4 {
-				item.ScheduleDate = copy_startime + 259200
-			}
-			if item.ScheduleWeek == 5 {
-				item.ScheduleDate = copy_startime + 345600
-			}
-
-			if item.ScheduleWeek == 6 {
-				item.ScheduleDate = copy_startime + 432000
-			}
-			//礼拜天
-			if item.ScheduleWeek == 0 {
-				item.ScheduleDate = copy_endtime
-			}
-			schedule := models.XtSchedule{
-				UserOrgId:    item.UserOrgId,
-				PartitionId:  item.PartitionId,
-				BedId:        item.BedId,
-				PatientId:    item.PatientId,
-				ScheduleDate: item.ScheduleDate,
-				ScheduleType: item.ScheduleType,
-				ScheduleWeek: item.ScheduleWeek,
-				ModeId:       item.ModeId,
-				Status:       1,
-				CreatedTime:  time.Now().Unix(),
-			}
-
-			err := service.AddPatientSchedule(&schedule)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"schedule": schedule,
-			})
+	//先清除复制周的排班
+	errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+	fmt.Println(errcode)
+	for _, item := range schedules {
+		//fmt.Println(item.StartTime+604800)
+		//礼拜1
+		if item.ScheduleWeek == 1 {
+			item.ScheduleDate = copy_startime
+		}
+		if item.ScheduleWeek == 2 {
+			item.ScheduleDate = copy_startime + 86400
+		}
+		if item.ScheduleWeek == 3 {
+			item.ScheduleDate = copy_startime + 172800
+		}
+		if item.ScheduleWeek == 4 {
+			item.ScheduleDate = copy_startime + 259200
+		}
+		if item.ScheduleWeek == 5 {
+			item.ScheduleDate = copy_startime + 345600
 		}
-	} else if errcode == nil {
-
-		//先清除复制周的排班
-		errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
-		fmt.Println(errcode)
-		for _, item := range schedules {
-			//fmt.Println(item.StartTime+604800)
-			//礼拜1
-			if item.ScheduleWeek == 1 {
-				item.ScheduleDate = copy_startime
-			}
-			if item.ScheduleWeek == 2 {
-				item.ScheduleDate = copy_startime + 86400
-			}
-			if item.ScheduleWeek == 3 {
-				item.ScheduleDate = copy_startime + 172800
-			}
-			if item.ScheduleWeek == 4 {
-				item.ScheduleDate = copy_startime + 259200
-			}
-			if item.ScheduleWeek == 5 {
-				item.ScheduleDate = copy_startime + 345600
-			}
 
-			if item.ScheduleWeek == 6 {
-				item.ScheduleDate = copy_startime + 432000
-			}
-			//礼拜天
-			if item.ScheduleWeek == 0 {
-				item.ScheduleDate = copy_endtime
-			}
-			schedule := models.XtSchedule{
-				UserOrgId:    item.UserOrgId,
-				PartitionId:  item.PartitionId,
-				BedId:        item.BedId,
-				PatientId:    item.PatientId,
-				ScheduleDate: item.ScheduleDate,
-				ScheduleType: item.ScheduleType,
-				ScheduleWeek: item.ScheduleWeek,
-				ModeId:       item.ModeId,
-				Status:       1,
-				CreatedTime:  time.Now().Unix(),
-			}
+		if item.ScheduleWeek == 6 {
+			item.ScheduleDate = copy_startime + 432000
+		}
+		//礼拜天
+		if item.ScheduleWeek == 0 {
+			item.ScheduleDate = copy_endtime
+		}
+		schedule := models.XtSchedule{
+			UserOrgId:    item.UserOrgId,
+			PartitionId:  item.PartitionId,
+			BedId:        item.BedId,
+			PatientId:    item.PatientId,
+			ScheduleDate: item.ScheduleDate,
+			ScheduleType: item.ScheduleType,
+			ScheduleWeek: item.ScheduleWeek,
+			ModeId:       item.ModeId,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+		}
 
-			err := service.AddPatientSchedule(&schedule)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"schedule": schedule,
-			})
+		err := service.AddPatientSchedule(&schedule)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
 	}
+	//查询复制中的排班日期是否存在
+	//_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
+	//
+	//if errcode == gorm.ErrRecordNotFound {
+	//	//如果没有直接新增
+	//
+	//	for _, item := range schedules {
+	//		//fmt.Println(item.StartTime+604800)
+	//		//礼拜1
+	//		if item.ScheduleWeek == 1 {
+	//			item.ScheduleDate = copy_startime
+	//		}
+	//		if item.ScheduleWeek == 2 {
+	//			item.ScheduleDate = copy_startime + 86400
+	//		}
+	//		if item.ScheduleWeek == 3 {
+	//			item.ScheduleDate = copy_startime + 172800
+	//		}
+	//		if item.ScheduleWeek == 4 {
+	//			item.ScheduleDate = copy_startime + 259200
+	//		}
+	//		if item.ScheduleWeek == 5 {
+	//			item.ScheduleDate = copy_startime + 345600
+	//		}
+	//
+	//		if item.ScheduleWeek == 6 {
+	//			item.ScheduleDate = copy_startime + 432000
+	//		}
+	//		//礼拜天
+	//		if item.ScheduleWeek == 0 {
+	//			item.ScheduleDate = copy_endtime
+	//		}
+	//		schedule := models.XtSchedule{
+	//			UserOrgId:    item.UserOrgId,
+	//			PartitionId:  item.PartitionId,
+	//			BedId:        item.BedId,
+	//			PatientId:    item.PatientId,
+	//			ScheduleDate: item.ScheduleDate,
+	//			ScheduleType: item.ScheduleType,
+	//			ScheduleWeek: item.ScheduleWeek,
+	//			ModeId:       item.ModeId,
+	//			Status:       1,
+	//			CreatedTime:  time.Now().Unix(),
+	//		}
+	//
+	//		err := service.AddPatientSchedule(&schedule)
+	//		if err != nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		}
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"schedule": schedule,
+	//		})
+	//	}
+	//} else if errcode == nil {
+	//
+	//	//先清除复制周的排班
+	//	errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+	//	fmt.Println(errcode)
+	//	for _, item := range schedules {
+	//		//fmt.Println(item.StartTime+604800)
+	//		//礼拜1
+	//		if item.ScheduleWeek == 1 {
+	//			item.ScheduleDate = copy_startime
+	//		}
+	//		if item.ScheduleWeek == 2 {
+	//			item.ScheduleDate = copy_startime + 86400
+	//		}
+	//		if item.ScheduleWeek == 3 {
+	//			item.ScheduleDate = copy_startime + 172800
+	//		}
+	//		if item.ScheduleWeek == 4 {
+	//			item.ScheduleDate = copy_startime + 259200
+	//		}
+	//		if item.ScheduleWeek == 5 {
+	//			item.ScheduleDate = copy_startime + 345600
+	//		}
+	//
+	//		if item.ScheduleWeek == 6 {
+	//			item.ScheduleDate = copy_startime + 432000
+	//		}
+	//		//礼拜天
+	//		if item.ScheduleWeek == 0 {
+	//			item.ScheduleDate = copy_endtime
+	//		}
+	//		schedule := models.XtSchedule{
+	//			UserOrgId:    item.UserOrgId,
+	//			PartitionId:  item.PartitionId,
+	//			BedId:        item.BedId,
+	//			PatientId:    item.PatientId,
+	//			ScheduleDate: item.ScheduleDate,
+	//			ScheduleType: item.ScheduleType,
+	//			ScheduleWeek: item.ScheduleWeek,
+	//			ModeId:       item.ModeId,
+	//			Status:       1,
+	//			CreatedTime:  time.Now().Unix(),
+	//		}
+	//
+	//		err := service.AddPatientSchedule(&schedule)
+	//		if err != nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		}
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"schedule": schedule,
+	//		})
+	//	}
+	//}
 }

models/drug.go

 	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/his_models.go

 }
 
 type HisProject struct {
-	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Pinyin                    string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                      string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
-	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
-	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
-	ExecutiveSection          int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
-	MedicalCoverage           int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
-	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
-	DiseaseDirectory          int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
-	IsRecord                  int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
-	TubeColor                 int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
-	MedicalStatus             int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
-	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Sign                      int64   `gorm:"column:sign" json:"sign" form:"sign"`
-	DefaultNumber             string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
-	IsDefault                 int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsCharge                  int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
-	IsEstimate                int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
-	IsWorkload                int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
-	Sort                      string  `gorm:"column:sort" json:"sort" form:"sort"`
-	DoctorAdvice              int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 }
 
 func (HisProject) TableName() string {

service/schedule_service.go

 	return &schedule, nil
 }
 func AddPatientSchedule(schedule *models.XtSchedule) error {
-
-	err := XTWriteDB().Create(&schedule).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&schedule).Error
+	utx.Commit()
 	return err
 }
 

service/stock_service.go

 	return
 }
 
+func FindGoodInfoByNameTwo(name string, org_id int64, good_type_id int64, good_name string) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and good_name = ?", org_id, name, good_type_id, good_name).Count(&total)
+	return
+}
+
 func FindGoodInfoByNameOne(name string, org_id int64, good_type_id int64, id int64) (total int64) {
 	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and id <> ? ", org_id, name, good_type_id, id).Count(&total)
 	return
 	return &manufacturer, nil
 }
 
+func CreateManufacturer(manufacturer *models.Manufacturer) error {
+
+	err := XTWriteDB().Create(manufacturer).Error
+	return err
+}
+
+func UpdatedManufactur(manufacturer *models.Manufacturer, orgid int64) error {
+
+	err := XTWriteDB().Model(&manufacturer).Where("org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"manufacturer_name": manufacturer.ManufacturerName}).Error
+	return err
+}
+
 func CreateGoodsInfomation(info *models.GoodInfo, orgid int64) error {
 
 	goodInfo := models.GoodInfo{
-		GoodName:              info.GoodName,
-		MedicalInsuranceLevel: info.MedicalInsuranceLevel,
-		OrgId:                 orgid,
-		Status:                1,
-		Ctime:                 time.Now().Unix(),
+		GoodName:                    info.GoodName,
+		SpecificationName:           info.SpecificationName,
+		GoodKind:                    info.GoodKind,
+		GoodTypeId:                  info.GoodTypeId,
+		Dealer:                      info.Dealer,
+		GoodUnit:                    info.GoodUnit,
+		IsRecord:                    info.IsRecord,
+		IsSpecialDiseases:           info.IsSpecialDiseases,
+		Manufacturer:                info.Manufacturer,
+		Pinyin:                      info.Pinyin,
+		ProductionType:              info.ProductionType,
+		Remark:                      info.Remark,
+		RetailPrice:                 info.RetailPrice,
+		SocialSecurityDirectoryCode: info.SocialSecurityDirectoryCode,
+		SpecialMedical:              info.SpecialMedical,
+		Wubi:                        info.Wubi,
+		StockWarnCount:              info.StockWarnCount,
+		MedicalInsuranceLevel:       info.MedicalInsuranceLevel,
+		OrgId:                       orgid,
+		Status:                      1,
+		Ctime:                       time.Now().Unix(),
+		StatisticsCategory:          info.StatisticsCategory,
+		GoodCode:                    info.GoodCode,
 	}
 	err := XTWriteDB().Create(&goodInfo).Error
 	return err
 	return goodInfo, err
 }
 
-func CreateDrugsInfomation(info *models.BaseDrugLib, orgid int64) error {
-
-	goodInfo := models.BaseDrugLib{
-		DrugName:              info.DrugName,
-		DrugAlias:             info.DrugAlias,
-		DrugSpec:              info.DrugSpec,
-		DrugType:              info.DrugType,
-		DrugStockLimit:        info.DrugStockLimit,
-		DrugOriginPlace:       info.DrugOriginPlace,
-		DrugDosageForm:        info.DrugDosageForm,
-		MedicalInsuranceLevel: info.MedicalInsuranceLevel,
-		MaxUnit:               info.MaxUnit,
-		MinUnit:               info.MinUnit,
-		UnitMatrixing:         info.UnitMatrixing,
-		RetailPrice:           info.RetailPrice,
-		LastPrice:             info.LastPrice,
-		DrugClassify:          info.DrugClassify,
-		Manufacturer:          info.Manufacturer,
-		Dealer:                info.Dealer,
-		OrgId:                 orgid,
-		Status:                1,
-		Ctime:                 time.Now().Unix(),
+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
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
 	}
-	err := XTWriteDB().Create(&goodInfo).Error
+	if err != nil {
+		return nil, err
+	}
+	return &drug, nil
+}
+
+func CreateDrugsInfomation(info *models.BaseDrugLib) error {
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
+
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark}).Error
 	return err
 }
 
 func CreateProjectInfomation(info *models.HisProject, orgid int64) error {
 
 	project := models.HisProject{
-		ProjectName:      info.ProjectName,
-		Price:            info.Price,
-		Unit:             info.Unit,
-		CostClassify:     info.CostClassify,
-		ExecutiveSection: info.ExecutiveSection,
-		MedicalCoverage:  info.MedicalCoverage,
-		UserOrgId:        orgid,
-		Status:           1,
-		CreatedTime:      time.Now().Unix(),
+		ProjectName:                 info.ProjectName,
+		Price:                       info.Price,
+		Unit:                        info.Unit,
+		CostClassify:                info.CostClassify,
+		ExecutiveSection:            info.ExecutiveSection,
+		MedicalCoverage:             info.MedicalCoverage,
+		UserOrgId:                   orgid,
+		Status:                      1,
+		CreatedTime:                 time.Now().Unix(),
+		Pinyin:                      info.Pinyin,
+		Wubi:                        info.Wubi,
+		StatisticalClassification:   info.StatisticalClassification,
+		DiseaseDirectory:            info.DiseaseDirectory,
+		IsRecord:                    info.IsRecord,
+		MedicalCode:                 info.MedicalCode,
+		TubeColor:                   info.TubeColor,
+		SingleDose:                  info.SingleDose,
+		DeliveryWay:                 info.DeliveryWay,
+		NumberDays:                  info.NumberDays,
+		Total:                       info.Total,
+		Category:                    info.Category,
+		MedicalStatus:               info.MedicalStatus,
+		SpecailProject:              info.SpecailProject,
+		RecordDate:                  info.RecordDate,
+		Remark:                      info.Remark,
+		SocialSecurityDirectoryCode: info.SocialSecurityDirectoryCode,
 	}
 	err := XTWriteDB().Create(&project).Error
 	return err
 	err = XTReadDB().Model(&warehouseinfo).Where("warehouse_out_id = ? and org_id = ? and status= 1 and is_sys = 0", warehouseoutid, orgid).Find(&warehouseinfo).Error
 	return warehouseinfo, err
 }
+
+func EditDrugWarehousingOne(warehouse models.DrugWarehouse, id int64) {
+	err = readDb.Model(&models.DrugWarehouse{}).Where("warehousing_order = ? AND status = 1 and id = ?", warehouse.WarehousingOrder, id).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehousing_time": warehouse.WarehousingTime, "modifier": warehouse.Modifier, "dealer": warehouse.Dealer, "manufacturer": warehouse.Manufacturer}).Error
+
+}
+
+func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+
+func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
+	var dealer models.Dealer
+	var err error
+	err = XTReadDB().Model(&dealer).Where("org_id = ? and dealer_name = ? and status = 1", orgid, name).Find(&dealer).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dealer, nil
+}
+
+func CreateDealer(dealer *models.Dealer) error {
+
+	err := XTWriteDB().Create(&dealer).Error
+	return err
+}
+
+func UpdateDealer(dealer *models.Dealer, orgid int64) error {
+
+	err := XTWriteDB().Model(&dealer).Where("org_id = ? and status  =1", orgid).Updates(map[string]interface{}{"dealer_name": dealer.DealerName}).Error
+	return err
+}
+
+func GetDrugDataConfig(orgid int64, name string) (models.DictDataconfig, error) {
+	dataconfig := models.DictDataconfig{}
+	err := XTReadDB().Where("org_id = ? and name = ?", orgid, name).Find(&dataconfig).Error
+	return dataconfig, err
+}
+
+func GetParentDataConfig(parentid int64, orgid int64) (dataconfig []*models.DictDataconfig, err error) {
+
+	err = XTReadDB().Where("parent_id = ?  and status =1 and (org_id = ? or org_id = 0)", parentid, orgid).Find(&dataconfig).Error
+	return dataconfig, err
+}
+
+func IsExistDicConfig(parentid int64, goodKind string, orgid int64) (*models.DictDataconfig, error) {
+
+	var dataconfig models.DictDataconfig
+	var err error
+	err = XTReadDB().Where("parent_id = ? and status = 1 and name = ? and (org_id = ? or org_id = 0)", parentid, goodKind, orgid).Find(&dataconfig).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dataconfig, nil
+}
+
+func CreatedDicConfig(dataconfig *models.DictDataconfig) error {
+
+	err := XTWriteDB().Create(&dataconfig).Error
+	return err
+}
+
+func UpdatedDicConfig(parentid int64, dataconfig *models.DictDataconfig, orgid int64, goodKind string) error {
+
+	err := XTWriteDB().Model(&dataconfig).Where("parent_id = ? and org_id = ? and name = ?", parentid, orgid, goodKind).Updates(map[string]interface{}{"name": dataconfig.Name}).Error
+	return err
+}
+
+func GetGoodType(goodName string, orgid int64) (*models.GoodsType, error) {
+
+	var goodType models.GoodsType
+	var err error
+	err = XTReadDB().Where("type_name =? and org_id = ? and status = 1", goodName, orgid).Find(&goodType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodType, nil
+}
+
+func CreatedGoodType(goodsType *models.GoodsType) error {
+
+	err := XTWriteDB().Create(&goodsType).Error
+	return err
+}
+
+func GetAllGoodType(orgid int64) (goodsType []*models.GoodsType, err error) {
+
+	err = XTReadDB().Model(&goodsType).Where("org_id = ? and status = 1", orgid).Find(&goodsType).Error
+	return goodsType, err
+}
+
+func GetDepartMentByName(name string, orgid int64) (*models.XtHisDepartment, error) {
+
+	var department models.XtHisDepartment
+	var err error
+	err = XTReadDB().Where("name= ? and user_org_id = ? and status = 1", name, orgid).Find(&department).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &department, nil
+}