no message

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/data_api_controller.go

@@ -79,6 +79,7 @@ func (c *DataApiController) CreateConfig() {
 	// 验证关键字段的值是否重复
 
 	thisConfig, _ := service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName, adminUserInfo.CurrentOrgId)
+	fmt.Println("99999", thisConfig)
 	if thisConfig.ID > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
 		return
@@ -385,7 +386,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/his_api_controller.go

@@ -0,0 +1,538 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"github.com/astaxie/beego"
+	"reflect"
+	"strconv"
+	"time"
+)
+
+type HisApiController struct {
+	BaseAuthAPIController
+}
+
+func HisManagerApiRegistRouters() {
+
+	beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
+	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
+	beego.Router("/api/hisprescription/config", &HisApiController{}, "get:GetHisPrescriptionConfig")
+
+	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
+
+	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
+	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
+	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "post:CreateHisPatientCaseHistory")
+	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "post:CreateCaseHistoryTemplate")
+	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
+	beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
+
+}
+
+func (c *HisApiController) GetHisPatientList() {
+	types, _ := c.GetInt64("type", 0)
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	if types == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patients,
+		})
+
+	} else if types == 1 { //未就诊
+		var patientsOne []*service.Schedule
+		for _, item := range patients {
+			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
+				patientsOne = append(patientsOne, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsOne,
+		})
+
+	} else if types == 2 { //已就诊
+		var patientsTwo []*service.Schedule
+		for _, item := range patients {
+			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
+				patientsTwo = append(patientsTwo, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsTwo,
+		})
+	}
+
+}
+func (c *HisApiController) GetHisPatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":     his_patient_info,
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"case_history": case_history,
+	})
+	return
+
+}
+func (c *HisApiController) GetHisPrescriptionConfig() {
+	adminInfo := c.GetAdminUserInfo()
+	//获取医嘱模版
+	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
+	//获取所有基础药
+	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+
+	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+
+	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"drugs":            drugs,
+		"advices_template": advices,
+		"drugways":         drugways,
+		"efs":              efs,
+		"doctors":          doctors,
+	})
+}
+func (c *HisApiController) CreateHisPrescription() {
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	//diagnose := c.GetString("diagnose")
+	//sick_history := c.GetString("sick_history")
+	doctor, _ := c.GetInt64("doctor")
+	//departm/**/ent, _ := c.GetInt64("department")
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := c.GetAdminUserInfo()
+	recordDateTime := theTime.Unix()
+
+	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+
+		if len(prescriptions) > 0 {
+			for _, item := range prescriptions {
+				items := item.(map[string]interface{})
+
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				types := int64(items["type"].(float64))
+
+				ctime := time.Now().Unix()
+				prescription := &models.HisPrescription{
+					PatientId:  patient_id,
+					UserOrgId:  adminInfo.CurrentOrgId,
+					RecordDate: recordDateTime,
+					Ctime:      ctime,
+					Mtime:      ctime,
+					Type:       types,
+					Modifier:   adminInfo.AdminUser.Id,
+					Creator:    adminInfo.AdminUser.Id,
+					Status:     1,
+					Doctor:     doctor,
+				}
+				service.SaveHisPrescription(prescription)
+
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					groupNo := group + 1
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var s models.HisDoctorAdviceInfo
+							s.PrescriptionId = prescription.ID
+							s.AdviceType = 2
+							s.AdviceDoctor = adminInfo.AdminUser.Id
+							s.StopState = 2
+							s.ExecutionState = 2
+							s.AdviceDate = recordDateTime
+							s.Status = 1
+							s.UserOrgId = adminInfo.CurrentOrgId
+							s.RecordDate = recordDateTime
+							s.StartTime = recordDateTime
+							s.Groupno = groupNo
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+
+							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateHisDoctorAdvice(&s)
+						}
+					}
+				}
+
+			}
+		}
+	}
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisApiController) CreateHisAdditionalCharge() {
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := c.GetAdminUserInfo()
+	recordDateTime := theTime.Unix()
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	var additions []*models.HisAdditionalCharge
+	if dataBody["addition"] != nil && reflect.TypeOf(dataBody["addition"]).String() == "[]interface {}" {
+		additions, _ := dataBody["addition"].([]interface{})
+		if len(additions) > 0 {
+			for _, item := range additions {
+				items := item.(map[string]interface{})
+
+				if items["item_id"] == nil || reflect.TypeOf(items["item_id"]).String() != "float64" {
+					utils.ErrorLog("item_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				item_id := int64(items["item_id"].(float64))
+
+				if items["item_name"] == nil || reflect.TypeOf(items["item_name"]).String() != "string" {
+					utils.ErrorLog("item_name")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				item_name := items["item_name"].(string)
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+
+				ctime := time.Now().Unix()
+				additional := &models.HisAdditionalCharge{
+					PatientId:    patient_id,
+					HisPatientId: his_patient_id,
+					UserOrgId:    adminInfo.CurrentOrgId,
+					RecordDate:   recordDateTime,
+					CreatedTime:  ctime,
+					UpdatedTime:  ctime,
+					Modifier:     adminInfo.AdminUser.Id,
+					Creator:      adminInfo.AdminUser.Id,
+					Price:        price,
+					ItemName:     item_name,
+					ItemId:       item_id,
+					Status:       1,
+				}
+				additions = append(additions, additional)
+			}
+		}
+	}
+	for _, item := range additions {
+		service.CreateAddtionalCharge(item)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "创建成功",
+	})
+}
+
+func (c *HisApiController) CreateHisPatientCaseHistory() {
+	diagnostic := c.GetString("diagnostic")
+	temperature, _ := c.GetFloat("temperature")
+	blood_sugar, _ := c.GetFloat("blood_sugar")
+	pulse, _ := c.GetFloat("pulse")
+	sbp, _ := c.GetFloat("sbp")
+	dbp, _ := c.GetFloat("dbp")
+	blood_fat, _ := c.GetFloat("blood_fat")
+	height, _ := c.GetFloat("height")
+	sick_type, _ := c.GetInt64("sick_type")
+	symptom := c.GetString("symptom")
+	sick_date := c.GetString("sick_date")
+	is_infect, _ := c.GetInt64("is_infect")
+	chief_conplaint := c.GetString("chief_conplaint")
+	history_of_present_illness := c.GetString("history_of_present_illness")
+	past_history := c.GetString("past_history")
+	personal_history := c.GetString("personal_history")
+	family_history := c.GetString("family_history")
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	sickTime, err := time.ParseInLocation(timeLayout+" 15:04:05", sick_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	sickTimes := sickTime.Unix()
+	ctime := time.Now().Unix()
+	caseHistory := models.HisPatientCaseHistory{
+		HisPatientId:            patient_id,
+		Temperature:             temperature,
+		BloodSugar:              blood_sugar,
+		Pulse:                   pulse,
+		Sbp:                     sbp,
+		Dbp:                     dbp,
+		Height:                  height,
+		BloodFat:                blood_fat,
+		SickType:                sick_type,
+		Symptom:                 symptom,
+		SickDate:                sickTimes,
+		IsInfect:                is_infect,
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		Doctor:                  c.GetAdminUserInfo().AdminUser.Id,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		Status:                  1,
+		Ctime:                   ctime,
+		Mtime:                   ctime,
+		RecordDate:              recordDateTime,
+	}
+	err = service.SaveHisPatientCaseHistory(caseHistory)
+	if err != nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+	}
+}
+func (c *HisApiController) GetHisPatientCaseHistoryList() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	adminUser := c.GetAdminUserInfo()
+	caseHistorys, _ := service.GetHisPatientCaseHistoryList(adminUser.CurrentOrgId, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": caseHistorys,
+	})
+
+}
+func (c *HisApiController) GetHisPatientCaseHistory() {
+	record_date, _ := c.GetInt64("record_date", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	admin := c.GetAdminUserInfo()
+	info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, record_date)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, record_date)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":         info,
+		"case_history": case_history,
+	})
+
+}
+func (c *HisApiController) CreateCaseHistoryTemplate() {
+	template_name := c.GetString("template_name")
+	template_remark := c.GetString("template_remark")
+	doctor := c.GetAdminUserInfo().AdminUser.Id
+	diagnostic := c.GetString("diagnostic")
+	chief_conplaint := c.GetString("chief_conplaint")
+	history_of_present_illness := c.GetString("history_of_present_illness")
+	past_history := c.GetString("past_history")
+	personal_history := c.GetString("personal_history")
+	family_history := c.GetString("family_history")
+	record_date := c.GetString("record_date")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	ctime := time.Now().Unix()
+
+	template := models.HisCaseHistoryTemplate{
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		Status:                  1,
+		Ctime:                   ctime,
+		Mtime:                   ctime,
+		RecordDate:              recordDateTime,
+		TemplateName:            template_name,
+		TemplateRemark:          template_remark,
+		Creator:                 doctor,
+		Modifier:                doctor,
+	}
+
+	err = service.SaveHisPatientCaseHistoryTemplate(template)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+func (c *HisApiController) GetCaseHistoryTemplate() {
+	admin := c.GetAdminUserInfo()
+	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+
+}
+func (c *HisApiController) GetPrintHisPatientCaseHistory() {
+
+}
+func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]interface{}) int {
+
+	if json["drug_name"] == nil || reflect.TypeOf(json["drug_name"]).String() != "string" {
+		utils.ErrorLog("drug_name")
+		return enums.ErrorCodeParamWrong
+	}
+	adviceName, _ := json["drug_name"].(string)
+	if len(adviceName) == 0 {
+		utils.ErrorLog("len(advice_name) == 0")
+		return enums.ErrorCodeParamWrong
+	}
+	advice.AdviceName = adviceName
+	adviceDesc, _ := json["advice_desc"].(string)
+	advice.AdviceDesc = adviceDesc
+	if json["drug_spec"] != nil && reflect.TypeOf(json["drug_spec"]).String() == "string" {
+		drugSpec, _ := strconv.ParseFloat(json["drug_spec"].(string), 64)
+		advice.DrugSpec = drugSpec
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		advice.Remark = remark
+	}
+	if json["id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+			drug_id := int64(json["id"].(float64))
+			advice.DrugId = drug_id
+		}
+	}
+
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		drugSpecUnit, _ := json["min_unit"].(string)
+		advice.DrugSpecUnit = drugSpecUnit
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["min_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["min_unit"].(string)
+		advice.PrescribingNumberUnit = prescribingNumberUnit
+	}
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		advice.Remark = remark
+	}
+	//if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+	//	advice.Price = json["retail_price"].(float64)
+	//}
+
+	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
+		advice.Price = price
+	}
+	return 0
+}

controllers/his_project_api_controller.go

@@ -0,0 +1,885 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type HisProjectApiController struct {
+	BaseAuthAPIController
+}
+
+func HisProjectRouters() {
+
+	beego.Router("/api/his/saveproject", &HisProjectApiController{}, "Get:SaveProject")
+	beego.Router("/api/his/getprojectlist", &HisProjectApiController{}, "Get:GetProjectList")
+	beego.Router("/api/his/getprojectdetail", &HisProjectApiController{}, "Get:GetProjectDetail")
+	beego.Router("/api/his/updatedproject", &HisProjectApiController{}, "Get:UpdatedProject")
+	beego.Router("/api/his/deletehisproject", &HisProjectApiController{}, "Get:DeleteHisProject")
+	beego.Router("/api/his/saveprojectteam", &HisProjectApiController{}, "Get:SaveProjectTeam")
+	beego.Router("/api/his/getprojectteamlist", &HisProjectApiController{}, "Get:GetProjectTeamList")
+	beego.Router("/api/his/getprojectteamdetail", &HisProjectApiController{}, "Get:GetProjectTeamDetail")
+	beego.Router("/api/his/updateprojectteam", &HisProjectApiController{}, "Get:UpdatedProjectTeam")
+	beego.Router("/api/his/deleteprojectteam", &HisProjectApiController{}, "Get:DeleteProjectTeam")
+	beego.Router("/api/his/savedepartment", &HisProjectApiController{}, "Get:SaveDePartment")
+	beego.Router("/api/his/getdepartmentlist", &HisProjectApiController{}, "Get:GetDepartMentList")
+	beego.Router("/api/his/getdepartmentdetail", &HisProjectApiController{}, "Get:GetDepartMentDetail")
+	beego.Router("/api/his/updagtedepartment", &HisProjectApiController{}, "Get:UpdatedDeparment")
+	beego.Router("/api/his/deletedeparment", &HisProjectApiController{}, "Get:DeleteDepartment")
+	beego.Router("/api/his/getallprojectlist", &HisProjectApiController{}, "Get:GetAllProjectList")
+	beego.Router("/api/his/addprojectlist", &HisProjectApiController{}, "Get:AddProjectList")
+	beego.Router("/api/his/deleteproject", &HisProjectApiController{}, "Get:DeleteProject")
+	beego.Router("/api/his/gethisproject", &HisProjectApiController{}, "Get:GetHisProject")
+	beego.Router("/api/his/getprojectteam", &HisProjectApiController{}, "Get:GetProjectTeam")
+	beego.Router("/api/his/getalldoctorlist", &HisProjectApiController{}, "Get:GetAllDoctorList")
+	beego.Router("/api/his/savehispatient", &HisProjectApiController{}, "Get:SaveHisPatient")
+	//获取今日血透排班的患者
+	beego.Router("/api/his/getbloodpatient", &HisProjectApiController{}, "Get:GetBloodPatientList")
+	//获取患者的今日透析处方
+	beego.Router("/api/his/gethisprescription", &HisProjectApiController{}, "Get:GetHisPrescription")
+	//新增附加费用
+	beego.Router("/api/his/additionalcharge", &HisProjectApiController{}, "Post:AdditionalCharge")
+	//获取治疗单
+	beego.Router("/api/his/gettreatlist", &HisProjectApiController{}, "Get:GetTreatmentList")
+	beego.Router("/api/his/getpatientinformation", &HisProjectApiController{}, "Get:GetPatientInformation")
+	beego.Router("/api/hist/getallprojecteam", &HisProjectApiController{}, "Get:GetAllProjectTeam")
+	beego.Router("/api/his/getprojectlistbyid", &HisProjectApiController{}, "Get:GetProjectListById")
+	beego.Router("/api/his/gethispatienthistory", &HisProjectApiController{}, "Get:GetHisPatientHistory")
+}
+
+func (this *HisProjectApiController) SaveProject() {
+
+	project_name := this.GetString("project_name")
+	pinyin := this.GetString("pinyin")
+	wubi := this.GetString("wubi")
+	price := this.GetString("price")
+	price_float, err := strconv.ParseFloat(price, 64)
+	unit := this.GetString("unit")
+	cost_classify, _ := this.GetInt64("cost_classify")
+	executive_section, _ := this.GetInt64("executive_section")
+	medical_coverage, _ := this.GetInt64("medical_coverage")
+	statistical_classification, _ := this.GetInt64("statistical_classification")
+	disease_directory, _ := this.GetInt64("disease_directory")
+	is_record, _ := this.GetInt64("is_record")
+	medical_code := this.GetString("medical_code")
+	tube_color, _ := this.GetInt64("tube_color")
+	medical_status, _ := this.GetInt64("medical_status")
+	remark := this.GetString("remark")
+	sign, _ := this.GetInt64("sign")
+	default_number := this.GetString("default_number")
+	is_charge, _ := this.GetInt64("is_charge")
+	is_estimate, _ := this.GetInt64("is_estimate")
+	is_workload, _ := this.GetInt64("is_workload")
+	sort := this.GetString("sort")
+	is_advice, _ := this.GetInt64("is_advice")
+	is_default, _ := this.GetInt64("is_default")
+	single_dose := this.GetString("single_dose")
+	delivery_way := this.GetString("delivery_way")
+	execution_frequency := this.GetString("execution_frequency")
+	number_days := this.GetString("number_days")
+	total := this.GetString("total")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	hisProject := models.XtHisProject{
+		ProjectName:               project_name,
+		Pinyin:                    pinyin,
+		Wubi:                      wubi,
+		Price:                     price_float,
+		Unit:                      unit,
+		CostClassify:              cost_classify,
+		ExecutiveSection:          executive_section,
+		MedicalCoverage:           medical_coverage,
+		StatisticalClassification: statistical_classification,
+		DiseaseDirectory:          disease_directory,
+		IsRecord:                  is_record,
+		MedicalCode:               medical_code,
+		TubeColor:                 tube_color,
+		MedicalStatus:             medical_status,
+		Remark:                    remark,
+		Sign:                      sign,
+		DefaultNumber:             default_number,
+		IsCharge:                  is_charge,
+		IsEstimate:                is_estimate,
+		IsWorkload:                is_workload,
+		Sort:                      sort,
+		DoctorAdvice:              is_advice,
+		IsDefault:                 is_default,
+		UserOrgId:                 orgId,
+		Status:                    1,
+		CreatedTime:               time.Now().Unix(),
+		SingleDose:                single_dose,
+		DeliveryWay:               delivery_way,
+		ExecutionFrequency:        execution_frequency,
+		NumberDays:                number_days,
+		Total:                     total,
+	}
+	//查询项目名称是否存在
+	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
+	fmt.Println("9999999999999", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		fmt.Println("222")
+		err = service.CreateHisProject(&hisProject)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"hisProject": hisProject,
+		})
+		return
+	} else if errcode == nil {
+		fmt.Println("3333")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+}
+
+func (this *HisProjectApiController) GetProjectList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	is_charge, _ := this.GetInt64("is_charge")
+	is_start, _ := this.GetInt64("is_start")
+	keyword := this.GetString("keyword")
+	projecList, total, err := service.GetHisProjectList(orgId, limit, page, is_charge, is_start, keyword)
+	fmt.Println("err", err)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projecList": projecList,
+		"total":      total,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetProjectDetail() {
+	id, _ := this.GetInt64("id")
+	projectDetail, err := service.GetProjectDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projecDetail": projectDetail,
+	})
+	return
+}
+
+func (this *HisProjectApiController) UpdatedProject() {
+
+	id, _ := this.GetInt64("id")
+	project_name := this.GetString("project_name")
+	pinyin := this.GetString("pinyin")
+	wubi := this.GetString("wubi")
+	price := this.GetString("price")
+	price_float, _ := strconv.ParseFloat(price, 64)
+	unit := this.GetString("unit")
+	cost_classify, _ := this.GetInt64("cost_classify")
+	executive_section, _ := this.GetInt64("executive_section")
+	medical_coverage, _ := this.GetInt64("medical_coverage")
+	statistical_classification, _ := this.GetInt64("statistical_classification")
+	disease_directory, _ := this.GetInt64("disease_directory")
+	is_record, _ := this.GetInt64("is_record")
+	medical_code := this.GetString("medical_code")
+	tube_color, _ := this.GetInt64("tube_color")
+	medical_status, _ := this.GetInt64("medical_status")
+	remark := this.GetString("remark")
+	sign, _ := this.GetInt64("sign")
+	default_number := this.GetString("default_number")
+	is_charge, _ := this.GetInt64("is_charge")
+	is_estimate, _ := this.GetInt64("is_estimate")
+	is_workload, _ := this.GetInt64("is_workload")
+	sort := this.GetString("sort")
+	is_advice, _ := this.GetInt64("is_advice")
+	is_default, _ := this.GetInt64("is_default")
+	single_dose := this.GetString("single_dose")
+	delivery_way := this.GetString("delivery_way")
+	execution_frequency := this.GetString("execution_frequency")
+	number_days := this.GetString("number_days")
+	total := this.GetString("total")
+	hisProject := models.XtHisProject{
+		ProjectName:               project_name,
+		Pinyin:                    pinyin,
+		Wubi:                      wubi,
+		Price:                     price_float,
+		Unit:                      unit,
+		CostClassify:              cost_classify,
+		ExecutiveSection:          executive_section,
+		MedicalCoverage:           medical_coverage,
+		StatisticalClassification: statistical_classification,
+		DiseaseDirectory:          disease_directory,
+		IsRecord:                  is_record,
+		MedicalCode:               medical_code,
+		TubeColor:                 tube_color,
+		MedicalStatus:             medical_status,
+		Remark:                    remark,
+		Sign:                      sign,
+		DefaultNumber:             default_number,
+		IsCharge:                  is_charge,
+		IsEstimate:                is_estimate,
+		IsWorkload:                is_workload,
+		Sort:                      sort,
+		DoctorAdvice:              is_advice,
+		IsDefault:                 is_default,
+		UpdatedTime:               time.Now().Unix(),
+		SingleDose:                single_dose,
+		DeliveryWay:               delivery_way,
+		ExecutionFrequency:        execution_frequency,
+		NumberDays:                number_days,
+		Total:                     total,
+	}
+
+	err := service.UpdatedProject(id, &hisProject)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"hisProject": hisProject,
+	})
+	return
+}
+
+func (this *HisProjectApiController) DeleteHisProject() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteHisProject(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *HisProjectApiController) SaveProjectTeam() {
+
+	project_team := this.GetString("project_team")
+
+	price := this.GetString("price")
+	price_float, _ := strconv.ParseFloat(price, 64)
+	pinyin := this.GetString("pinyin")
+	wubi := this.GetString("wubi")
+	tube_color, _ := this.GetInt64("tube_color")
+	team_type, _ := this.GetInt64("team_type")
+	remark := this.GetString("remark")
+	ids := this.GetString("ids")
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	projectTeam := models.XtHisProjectTeam{
+		ProjectTeam: project_team,
+		Price:       price_float,
+		Pinyin:      pinyin,
+		Wubi:        wubi,
+		TubeColor:   tube_color,
+		TeamType:    team_type,
+		Remark:      remark,
+		UserOrgId:   orgId,
+		Status:      1,
+		CreatedTime: time.Now().Unix(),
+		ProjectId:   ids,
+	}
+	fmt.Println(projectTeam)
+
+	_, errcodes := service.GetHisProjectByNameOne(project_team, orgId)
+
+	if errcodes == gorm.ErrRecordNotFound {
+
+		err := service.CreatedProjectTeam(&projectTeam)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"projectTeam": projectTeam,
+		})
+		return
+	} else if errcodes == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+}
+
+func (this *HisProjectApiController) GetProjectTeamList() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	keyword := this.GetString("keyword")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	projectTeamList, total, err := service.GetProjectTeamList(limit, page, orgId, keyword)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectTeamList": projectTeamList,
+		"total":           total,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetProjectTeamDetail() {
+
+	id, _ := this.GetInt64("id")
+	projectTeamDetail, err := service.GetProjectTeamDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectTeamDetail": projectTeamDetail,
+	})
+	return
+}
+
+func (this *HisProjectApiController) UpdatedProjectTeam() {
+
+	id, _ := this.GetInt64("id")
+	project_team := this.GetString("project_team")
+	price := this.GetString("price")
+	price_float, _ := strconv.ParseFloat(price, 64)
+	pinyin := this.GetString("pinyin")
+	wubi := this.GetString("wubi")
+	tube_color, _ := this.GetInt64("tube_color")
+	team_type, _ := this.GetInt64("team_type")
+	remark := this.GetString("remark")
+	ids := this.GetString("ids")
+	projectTeam := models.XtHisProjectTeam{
+		ProjectTeam: project_team,
+		Price:       price_float,
+		Pinyin:      pinyin,
+		Wubi:        wubi,
+		TubeColor:   tube_color,
+		TeamType:    team_type,
+		Remark:      remark,
+		ProjectId:   ids,
+	}
+
+	err := service.UpdatedProjectTeam(id, &projectTeam)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectTeam": projectTeam,
+	})
+	return
+}
+
+func (this *HisProjectApiController) DeleteProjectTeam() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteProjectTeam(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *HisProjectApiController) SaveDePartment() {
+
+	name := this.GetString("name")
+	number := this.GetString("number")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	department := models.XtHisDepartment{
+		Name:        name,
+		Number:      number,
+		UserOrgId:   orgId,
+		CreatedTime: time.Now().Unix(),
+		Status:      1,
+	}
+	err := service.CreateDePartment(&department)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"department": department,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetDepartMentList() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	departMentList, total, err := service.GetDepartMentList(limit, page, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"departMentList": departMentList,
+		"total":          total,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetDepartMentDetail() {
+
+	id, _ := this.GetInt64("id")
+	departDetail, err := service.GetDepartMentDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"departDetail": departDetail,
+	})
+	return
+}
+
+func (this *HisProjectApiController) UpdatedDeparment() {
+
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	number := this.GetString("number")
+	department := models.XtHisDepartment{
+		Name:   name,
+		Number: number,
+	}
+	err := service.UpdatedDepartment(id, &department)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"department": department,
+	})
+	return
+}
+
+func (this *HisProjectApiController) DeleteDepartment() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteDepartment(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *HisProjectApiController) GetBloodPatientList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println("org", orgId)
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+
+	//统计血透排班的患者
+	scheduleList, err := service.GetBloodPatientList(orgId, timenow)
+	//统计当日挂号的患者
+	hisPatient, _ := service.GetHisPatient(orgId, timenow)
+	//统计今天开处方的患者
+	prescription, _ := service.GetHisPrescriptionOther(orgId, timenow)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheduleList": scheduleList,
+		"hisPatient":   hisPatient,
+		"prescription": prescription,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetHisPrescription() {
+
+	id, _ := this.GetInt64("id")
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	prescriptionList, err := service.GetHisPrescriptionByPatientId(id, timenow)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"prescriptionList": prescriptionList,
+	})
+	return
+}
+
+func (this *HisProjectApiController) AdditionalCharge() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	his_patient_id := int64(dataBody["his_patient_id"].(float64))
+	patient_id := int64(dataBody["patient_id"].(float64))
+	fmt.Println("patient_id2222222222", patient_id)
+	medicineData, _ := dataBody["medicineData"].([]interface{})
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	admin_user_id := adminUserInfo.AdminUser.Id
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	for _, item := range medicineData {
+		items := item.(map[string]interface{})
+		//drug_id := int64(items["id"].(float64))
+		money := items["money"].(string)
+		moneys, _ := strconv.ParseInt(money, 10, 64)
+		monStr := strconv.FormatInt(moneys, 10)
+		monneyStr, _ := strconv.ParseFloat(monStr, 64)
+		additionalCharge := models.HisAdditionalCharge{
+			HisPatientId: his_patient_id,
+			UserOrgId:    orgId,
+			PatientId:    patient_id,
+			RecordDate:   timenow,
+			Price:        monneyStr,
+			Status:       1,
+			AdminUserId:  admin_user_id,
+			CreatedTime:  time.Now().Unix(),
+		}
+
+		err := service.CreateAdditionalCharge(&additionalCharge)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"additionalCharge": additionalCharge,
+		})
+		return
+	}
+}
+
+func (this *HisProjectApiController) GetTreatmentList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	treatmentList, err := service.GetTreatmentList(patient_id, timenow)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"treatmentList": treatmentList,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetAllProjectList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	projectList, err := service.GetAllProjectList(orgId)
+	//获取列表数据
+	hisprojectlist, err := service.GetHisProjectListByOrgId(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectList":    projectList,
+		"hisprojectlist": hisprojectlist,
+	})
+	return
+}
+
+func (this *HisProjectApiController) AddProjectList() {
+
+	id, _ := this.GetInt64("id")
+	number, _ := this.GetInt64("number")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	projectList := models.XtHisProjectList{
+		ProjectId:   id,
+		Number:      number,
+		UserOrgId:   orgId,
+		Status:      1,
+		CreatedTime: time.Now().Unix(),
+	}
+	err := service.CreateProjectList(&projectList)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectList": projectList,
+	})
+	return
+}
+
+func (this *HisProjectApiController) GetPatientInformation() {
+
+	id, _ := this.GetInt64("id")
+	information, err := service.GetHisPatientInformation(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+	return
+}
+
+func (this *HisProjectApiController) DeleteProject() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteProjectList(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *HisProjectApiController) GetHisProject() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	project, err := service.GetHisProject(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"project": project,
+	})
+}
+
+func (this *HisProjectApiController) GetProjectTeam() {
+
+	strids := this.GetString("strids")
+
+	idStrs := strings.Split(strids, ",")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	team, err := service.GetProjectTeam(idStrs, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"team": team,
+	})
+}
+
+func (this *HisProjectApiController) GetAllDoctorList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	appId := adminUserInfo.CurrentAppId
+	//获取所有的医生
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	//获取所有的科室
+	department, err := service.GetAllDepartMent(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"doctor":     doctor,
+		"department": department,
+	})
+}
+
+func (this *HisProjectApiController) SaveHisPatient() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	age, _ := this.GetInt64("age")
+
+	birthday := this.GetString("birthDay")
+	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
+	birthUnix := birthdays.Unix()
+	certificates, _ := this.GetInt64("certificates")
+	cost_checked, _ := this.GetInt64("costChecked")
+	cost, _ := this.GetInt64("cost")
+	costs := strconv.FormatInt(cost, 10)
+	cost_float, _ := strconv.ParseFloat(costs, 64)
+	department, _ := this.GetInt64("department")
+	doctor, _ := this.GetInt64("doctor")
+	medicalcare, _ := this.GetInt64("medicalCare")
+	idcard := this.GetString("idCard")
+	medicalExpenses, _ := this.GetInt64("medicalExpenses")
+	medicalExpense := strconv.FormatInt(medicalExpenses, 10)
+	medicalExpense_float, _ := strconv.ParseFloat(medicalExpense, 64)
+	medicalinsurancecard := this.GetString("medicalInsuranceCard")
+
+	name := this.GetString("name")
+	register, _ := this.GetInt64("register")
+	registrationfee, _ := this.GetInt64("registrationFee")
+	registrationfees := strconv.FormatInt(registrationfee, 10)
+	registrationfees_float, _ := strconv.ParseFloat(registrationfees, 64)
+	settlementValue, _ := this.GetInt64("settlementValue")
+	sex, _ := this.GetInt64("sex")
+	total, _ := this.GetInt64("total")
+	totals := strconv.FormatInt(total, 10)
+	totals_float, _ := strconv.ParseFloat(totals, 64)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeStr := time.Now().Format("2006-01-02")
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+
+	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		patient := models.XtHisPatient{
+			Age:                    age,
+			Birthday:               birthUnix,
+			IdType:                 certificates,
+			CostOfProduction:       cost_float,
+			Departments:            department,
+			AdminUserId:            doctor,
+			MedicalTreatmentType:   medicalcare,
+			IdCardNo:               idcard,
+			IsNeedCostOfProduction: cost_checked,
+			TreatmentCost:          medicalExpense_float,
+			MedicalInsuranceNumber: medicalinsurancecard,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			Status:                 1,
+			RecordDate:             timeStringToTime.Unix(),
+		}
+		err := service.CreateHisPatient(&patient)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient": patient,
+		})
+	} else if errcode == nil {
+		patient := models.XtHisPatient{
+			Age:                    age,
+			Birthday:               birthUnix,
+			IdType:                 certificates,
+			CostOfProduction:       cost_float,
+			Departments:            department,
+			AdminUserId:            doctor,
+			MedicalTreatmentType:   medicalcare,
+			IdCardNo:               idcard,
+			IsNeedCostOfProduction: cost_checked,
+			TreatmentCost:          medicalExpense_float,
+			MedicalInsuranceNumber: medicalinsurancecard,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			PatientId:              bloodPatient.ID,
+		}
+		err := service.CreateHisPatient(&patient)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient": patient,
+		})
+	}
+}
+
+func (this *HisProjectApiController) GetAllProjectTeam() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println("aaa")
+	team, err := service.GetAllProjectTeam(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"team": team,
+	})
+}
+
+func (this *HisProjectApiController) GetProjectListById() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	project_id := this.GetString("project_id")
+	idStrs := strings.Split(project_id, ",")
+	project, err := service.GetProjectListById(orgId, idStrs)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"project": project,
+	})
+}
+
+func (this *HisProjectApiController) GetHisPatientHistory() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	register_type, _ := this.GetInt64("register_type")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	fmt.Println(keyword, start_time, end_time, register_type, limit, page)
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	history, total, err := service.GetHisPatientHistory(keyword, startTime.Unix(), endTime.Unix(), register_type, limit, page, orgId)
+	department, err := service.GetAllDepartMent(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"history":    history,
+		"total":      total,
+		"department": department,
+	})
+}

controllers/manager_center_api_controller.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"time"
@@ -295,73 +296,139 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	err := service.UpdateBaseDrugLib(drugLib)
 
-	//修改xt_drug_name 表
-	drugName := models.XtDrugName{
-		DrugName: drug_name,
+	//查询是否存在
+	_, errOne := service.GetDrugNameIsExist(id, adminInfo.CurrentOrgId)
+	if errOne == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errOne == nil {
+		//修改xt_drug_name 表
+		drugName := models.XtDrugName{
+			DrugName: drug_name,
+		}
+		service.UpdatedDrugName(id, adminInfo.CurrentOrgId, &drugName)
 	}
-	service.UpdatedDrugName(id, adminInfo.CurrentOrgId, &drugName)
 
-	//修改规格xt_stand_name表
-	standName := models.XtStandName{
-		DrugName:       drug_name,
-		DrugSpec:       drug_spec,
-		DrugStockLimit: drug_stock_limit,
-		MinUnit:        min_unit,
-	}
+	//查询是否存在
+	_, errTwo := service.GetStandNameIsExist(id, adminInfo.CurrentOrgId)
+	if errTwo == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗1")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errTwo == nil {
+		//修改规格xt_stand_name表
+		standName := models.XtStandName{
+			DrugName:       drug_name,
+			DrugSpec:       drug_spec,
+			DrugStockLimit: drug_stock_limit,
+			MinUnit:        min_unit,
+		}
 
-	service.UpdateStandName(id, adminInfo.CurrentOrgId, &standName)
-	//修改药品表
-	medical := models.XtSelfMedical{
-		DrugName:           drug_name,
-		DrugSpec:           drug_spec,
-		ExecutionFrequency: execution_frequency,
-		PrescribingNumber:  prescribing_number,
-		DeliveryWay:        delivery_way,
-		SingleDose:         single_dose,
-		MinUnit:            min_unit,
+		service.UpdateStandName(id, adminInfo.CurrentOrgId, &standName)
 	}
 
-	service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+	_, errThree := service.GetSelfMedicalIsExist(id, adminInfo.CurrentOrgId)
+
+	if errThree == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗2")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errThree == nil {
+		//修改药品表
+		medical := models.XtSelfMedical{
+			DrugName:           drug_name,
+			DrugSpec:           drug_spec,
+			ExecutionFrequency: execution_frequency,
+			PrescribingNumber:  prescribing_number,
+			DeliveryWay:        delivery_way,
+			SingleDose:         single_dose,
+			MinUnit:            min_unit,
+		}
 
-	//修改入库表
-	//nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
+		service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+	}
 
-	stock := models.XtSelfStock{
-		DrugSpec: drug_spec,
-		DrugName: drug_name,
-		MinUnit:  min_unit,
+	_, errFour := service.GetSelfStosckIsExist(id, adminInfo.CurrentOrgId)
+	if errFour == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗3")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errFour == nil {
+		stock := models.XtSelfStock{
+			DrugSpec: drug_spec,
+			DrugName: drug_name,
+			MinUnit:  min_unit,
+		}
+		service.UpdatedSelfStock(&stock, id, adminInfo.CurrentOrgId)
 	}
 
-	service.UpdatedSelfStock(&stock, id, adminInfo.CurrentOrgId)
-	outStock := models.XtSelfOutStock{
-		DrugName: drug_name,
-		DrugSpec: drug_spec,
+	_, errFive := service.GetOutSelfOutStockIsExist(id, adminInfo.CurrentOrgId)
+	if errFive == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗4")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errFive == nil {
+		outStock := models.XtSelfOutStock{
+			DrugName: drug_name,
+			DrugSpec: drug_spec,
+		}
+		//修改出库表
+		service.UpdatedOutSelfStock(&outStock, id, adminInfo.CurrentOrgId)
 	}
-	//修改出库表
-	service.UpdatedOutSelfStock(&outStock, id, adminInfo.CurrentOrgId)
 
-	//查询未执行的医嘱
-	advice := models.DoctorAdvice{
-		AdviceName:         drug_name,
-		AdviceDesc:         drug_spec,
-		DeliveryWay:        delivery_way,
-		ExecutionFrequency: execution_frequency,
-		SingleDose:         single_dose,
-		SingleDoseUnit:     min_unit,
+	_, errSix := service.GetDoctorAdviceIsExist(id, adminInfo.CurrentOrgId)
+	if errSix == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗5")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errSix == nil {
+		//查询未执行的医嘱
+		advice := models.DoctorAdvice{
+			AdviceName:         drug_name,
+			AdviceDesc:         drug_spec,
+			DeliveryWay:        delivery_way,
+			ExecutionFrequency: execution_frequency,
+			SingleDose:         single_dose,
+			SingleDoseUnit:     min_unit,
+		}
+
+		service.UpdateNoExcuteDoctorAdvice(id, adminInfo.CurrentOrgId, &advice)
 	}
 
-	service.UpdateNoExcuteDoctorAdvice(id, adminInfo.CurrentOrgId, &advice)
+	_, errSeven := service.GetDoctorAdviceTemplateIsExist(id, adminInfo.CurrentOrgId)
+
+	if errSeven == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗6")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errSeven == nil {
+		//修改医嘱模板
+		template := models.DoctorAdviceTemplate{
+			AdviceName:         drug_name,
+			AdviceDesc:         drug_spec,
+			DeliveryWay:        delivery_way,
+			ExecutionFrequency: execution_frequency,
+			SingleDose:         single_dose,
+			SingleDoseUnit:     min_unit,
+		}
+		service.UpdatedDoctorAdviceTemplate(id, adminInfo.CurrentOrgId, &template)
 
-	//修改医嘱模板
-	template := models.DoctorAdviceTemplate{
-		AdviceName:         drug_name,
-		AdviceDesc:         drug_spec,
-		DeliveryWay:        delivery_way,
-		ExecutionFrequency: execution_frequency,
-		SingleDose:         single_dose,
-		SingleDoseUnit:     min_unit,
 	}
-	service.UpdatedDoctorAdviceTemplate(id, adminInfo.CurrentOrgId, &template)
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1322,7 +1389,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId)
+	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId, good_id)
 	if totals > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -4,15 +4,15 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"github.com/astaxie/beego"
-	"net/http"
-	"net/url"
-	"strconv"
 	_ "XT_New/utils"
 	_ "encoding/json"
 	"fmt"
+	"github.com/astaxie/beego"
 	_ "github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"net/http"
+	"net/url"
+	"strconv"
 	_ "strings"
 
 	// "fmt"
@@ -67,106 +67,106 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 	if dialysistype == 1 {
 		// 保存透前相关数据
 		// 获取透析处方
-		dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-		if getDialysisPrescribeErr != nil {
-			c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		// 获取透析模版
-		dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
-		if getDialysisSolutionErr != nil {
-			c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		//dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		//if getDialysisPrescribeErr != nil {
+		//	c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//
+		//// 获取透析模版
+		//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
+		//if getDialysisSolutionErr != nil {
+		//	c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
 
 		// 插入透析处方
-		if dialysisPrescribe == nil && dialysisSolution != nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = dialysisSolution.UserOrgId
-			newprescribe.PatientId = dialysisSolution.PatientId
-			newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
-			newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
-			newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
-			newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
-			newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
-			newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
-			newprescribe.ModeId = dialysisSolution.ModeId
-			newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
-			newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
-			newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
-			newprescribe.BloodFilter = dialysisSolution.BloodFilter
-			newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
-			newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
-			newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
-			newprescribe.Glucose = dialysisSolution.Glucose
-			newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
-			newprescribe.Kalium = dialysisSolution.Kalium
-			newprescribe.Sodium = dialysisSolution.Sodium
-			newprescribe.Calcium = dialysisSolution.Calcium
-			newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
-			newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
-			newprescribe.Conductivity = dialysisSolution.Conductivity
-			newprescribe.BodyFluid = dialysisSolution.BodyFluid
-			newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
-			newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
-			newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
-			newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
-			newprescribe.BloodAccess = dialysisSolution.BloodAccess
-			newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
-			newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
-			newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
-			newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
-			newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
-			newprescribe.Dialyzer = dialysisSolution.Dialyzer
-			newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
-			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
-			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
-			newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe == nil && dialysisSolution == nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = adminUserInfo.Org.Id
-			newprescribe.PatientId = id
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe != nil {
-			dialysisPrescribe.UpdatedTime = time.Now().Unix()
-			dialysisPrescribe.RecordDate = theAssessmentDateTime
-			// dialysisPrescribe.DewaterAmount = dewater_amount
-			// dialysisPrescribe.TargetUltrafiltration = dewater_amount
-			dialysisPrescribe.Status = 1
-			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-			if updateErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
+		//if dialysisPrescribe == nil && dialysisSolution != nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = dialysisSolution.UserOrgId
+		//	newprescribe.PatientId = dialysisSolution.PatientId
+		//	newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
+		//	newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
+		//	newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
+		//	newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
+		//	newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
+		//	newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
+		//	newprescribe.ModeId = dialysisSolution.ModeId
+		//	newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
+		//	newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
+		//	newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
+		//	newprescribe.BloodFilter = dialysisSolution.BloodFilter
+		//	newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
+		//	newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
+		//	newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
+		//	newprescribe.Glucose = dialysisSolution.Glucose
+		//	newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
+		//	newprescribe.Kalium = dialysisSolution.Kalium
+		//	newprescribe.Sodium = dialysisSolution.Sodium
+		//	newprescribe.Calcium = dialysisSolution.Calcium
+		//	newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
+		//	newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
+		//	newprescribe.Conductivity = dialysisSolution.Conductivity
+		//	newprescribe.BodyFluid = dialysisSolution.BodyFluid
+		//	newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
+		//	newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
+		//	newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
+		//	newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
+		//	newprescribe.BloodAccess = dialysisSolution.BloodAccess
+		//	newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
+		//	newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
+		//	newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
+		//	newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
+		//	newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
+		//	newprescribe.Dialyzer = dialysisSolution.Dialyzer
+		//	newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
+		//	newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
+		//	newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
+		//	newprescribe.TargetKtv = dialysisSolution.TargetKtv
+		//
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe == nil && dialysisSolution == nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = adminUserInfo.Org.Id
+		//	newprescribe.PatientId = id
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe != nil {
+		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
+		//	// dialysisPrescribe.DewaterAmount = dewater_amount
+		//	// dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		//	dialysisPrescribe.Status = 1
+		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		//	if updateErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
@@ -696,7 +696,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 	}
 }
-
 func (c *CheckWeightApiController) GetPatientList() {
 	syncTime, _ := c.GetInt64("synctime", 0)
 	force, _ := c.GetInt64("force", 0)
@@ -714,7 +713,6 @@ func (c *CheckWeightApiController) GetPatientList() {
 		"servicetime": serviceTime,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)
 	if patientId <= 0 {
@@ -733,7 +731,6 @@ func (c *CheckWeightApiController) GetPatientListById() {
 		"patientinfo": patient,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {
@@ -801,7 +798,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 
 		// 排队叫号的签到
 		ssoDomain := beego.AppConfig.String("call_domain")
-		api := ssoDomain + "/index/patientsign/"+strconv.FormatInt(adminUserInfo.Org.Id, 10)+"/"+strconv.FormatInt(id, 10)
+		api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
 		values := make(url.Values)
 
 		http.PostForm(api, values)
@@ -968,8 +965,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 	}
 
-
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialysistype":     dialysistype,
 		"patient":          dialysisinfo,
@@ -979,7 +974,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	})
 	return
 }
-
 func (c *CheckWeightApiController) GetPatientInfoBeforeDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2350,25 +2350,25 @@ func (c *DialysisAPIController) GetLongAdvice() {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
 				week := int(t.Weekday())
+				fmt.Println(t.Weekday())
+
+				fmt.Println(week)
 
 				switch week {
 				case 1:
 					if strings.Index(advice.WeekDay, "周一") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 2:
 					if strings.Index(advice.WeekDay, "周二") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 3:
 					if strings.Index(advice.WeekDay, "周三") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 4:
 					if strings.Index(advice.WeekDay, "周四") == -1 {
@@ -2384,7 +2384,6 @@ func (c *DialysisAPIController) GetLongAdvice() {
 					if strings.Index(advice.WeekDay, "周六") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 0:
 					if strings.Index(advice.WeekDay, "周日") == -1 {
@@ -3581,17 +3580,13 @@ func (c *DialysisAPIController) EditConsumables() {
 					for _, before := range beforePrepares {
 
 						if consumable.GoodId == before.GoodId {
-							fmt.Println(consumable.Count)
-							fmt.Println(before.Count)
 
 							if consumable.Count != before.Count {
-								fmt.Println("111111111")
 								_, out := service.FindStockOutOrderNumberByTime(record_time, adminInfo.Org.Id)
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
-									fmt.Println("222222222")
 
 									warehouseOutInfo := &models.WarehouseOutInfo{
 										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
@@ -3614,7 +3609,7 @@ func (c *DialysisAPIController) EditConsumables() {
 									err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 									if err == nil {
 										//可能存在商品使用人不存在的情况，需要先判断商品使用人是否存在
-										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          warehouseOutInfo.ID,
@@ -3655,7 +3650,7 @@ func (c *DialysisAPIController) EditConsumables() {
 										} else if consumable.Count < before.Count { //增加
 											service.UpdateOrderCountAdd(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id, before.Count-consumable.Count)
 										}
-										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          newOut.ID,
@@ -4267,3 +4262,20 @@ func (c *DialysisAPIController) GetAllDrug() {
 	})
 
 }
+
+func RemoveRepeatedGoodTwo(arr []*models.DialysisBeforePrepare) (newArr []*models.DialysisBeforePrepare) {
+	newArr = make([]*models.DialysisBeforePrepare, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].GoodId == arr[j].GoodId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -552,11 +552,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	//}
 
 	var advice models.DoctorAdvice
-	var tempAdvices []models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNoTwo(adminUserInfo.Org.Id, groupno)
-		tempAdvices = advices
+		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -564,9 +562,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 	} else {
-		advices, _ := service.FindDoctorAdviceByIdsTwo(adminUserInfo.Org.Id, ids)
-		tempAdvices = advices
-
+		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -626,10 +622,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if drugStockConfig.IsOpen == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -666,7 +662,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -711,7 +707,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -785,10 +781,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		} else {
-			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -825,7 +821,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -870,7 +866,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -954,8 +950,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-			for _, item := range tempAdvices {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range advices {
 
 				if item.ExecutionState == 1 && item.Way == 2 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -991,7 +987,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		} else {
 
-			for _, item := range tempAdvices {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				fmt.Println("item222222222222", item.ExecutionState)
 				if item.ExecutionState == 1 && item.Way == 2 {
 
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -2792,7 +2790,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
-	fmt.Println("is_child------------------------------", is_child)
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -42,6 +42,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	fmt.Println("partiontype", partitionType)
 	scheduleType, _ := this.GetInt64("scheduleType")
 	fmt.Println(scheduleType)
+
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {
 
@@ -151,7 +152,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	keyword := this.GetString("keyword")
 	//获取透析参数数据
-	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
+	//schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 	//查询今日排班的病人
 	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
 	var vlist []interface{}
@@ -176,9 +177,9 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 			"dialysis_goods": dialysisGoods,
 			"good_type":      goodTypes,
 			"total":          total,
-			"schedule":       schedule,
-			"prescription":   vlist,
-			"patient":        patient,
+			//"schedule":       schedule,
+			"prescription": vlist,
+			"patient":      patient,
 		})
 		return
 
@@ -200,7 +201,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 				"dialysis_goods": dialysisGoods,
 				"good_type":      goodTypes,
 				"total":          total,
-				"schedule":       schedule,
+				//"schedule":       schedule,
 				//"consumables":    consumables,
 				"prescription": vlist,
 				"reducelist":   clist,

controllers/schedule_api_controller.go

@@ -689,8 +689,10 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		for index := weekStart1; index <= weekEnd1; index++ {
 			theDay := thisTime1.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
-			if index == 0 {
+
+			if index == -1 {
 				start_time = theDay.Format("2006-01-02")
+				fmt.Println(start_time)
 			}
 
 			end_time = theDay.Format("2006-01-02")
@@ -729,7 +731,7 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		for index := weekStart2; index <= weekEnd2; index++ {
 			theDay := thisTime2.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
-			if index == 0 {
+			if index == -1 {
 				start_time = theDay.Format("2006-01-02")
 			}
 
@@ -1277,6 +1279,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 				date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 				sch.ScheduleDate = date.Unix()
 			}
+
 			sch.CreatedTime = time.Now().Unix()
 			sch.UpdatedTime = time.Now().Unix()
 			sch.ModeId = 1

models/his_models.go

@@ -0,0 +1,496 @@
+package models
+
+type XtHisProject 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"`
+	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	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"`
+}
+
+func (XtHisProject) TableName() string {
+	return "xt_his_project"
+}
+
+type XtHisProjectTeam struct {
+	ID          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price       float64 `gorm:"column:price" json:"price" form:"price"`
+	Pinyin      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType    int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+}
+
+func (XtHisProjectTeam) TableName() string {
+	return "xt_his_project_team"
+}
+
+type XtHisDepartment struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	Number      string `gorm:"column:number" json:"number" form:"number"`
+	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"`
+}
+
+func (XtHisDepartment) TableName() string {
+	return "xt_his_department"
+}
+
+type HisPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdNumber               string  `gorm:"column:id_number" json:"id_number" form:"id_number"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (HisPatient) TableName() string {
+	return "his_patient"
+}
+
+type HisPrescriptionVm struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number       string `gorm:"column:number" json:"number" form:"number"`
+	Type         int64  `gorm:"column:type" json:"type" form:"type"`
+	Doctor       int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator      int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Name         string
+}
+
+type HisCaseHistoryTemplate struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	HistoryOfPresentIllness string `gorm:"column:history_of_present_illness" json:"history_of_present_illness" form:"history_of_present_illness"`
+	PastHistory             string `gorm:"column:past_history" json:"past_history" form:"past_history"`
+	ChiefConplaint          string `gorm:"column:chief_conplaint" json:"chief_conplaint" form:"chief_conplaint"`
+	PersonalHistory         string `gorm:"column:personal_history" json:"personal_history" form:"personal_history"`
+	FamilyHistory           string `gorm:"column:family_history" json:"family_history" form:"family_history"`
+	Diagnostic              string `gorm:"column:diagnostic" json:"diagnostic" form:"diagnostic"`
+	UserOrgId               int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	RecordDate              int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	TemplateName            string `gorm:"column:template_name" json:"template_name" form:"template_name"`
+	TemplateRemark          string `gorm:"column:template_remark" json:"template_remark" form:"template_remark"`
+	Creator                 int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+}
+
+func (HisCaseHistoryTemplate) TableName() string {
+	return "his_patient"
+}
+
+type HisDoctorAdviceInfo struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+}
+
+func (HisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type HisGroupAdvice struct {
+	HisDoctorAdviceInfo
+	Children []*HisGroupAdvice
+}
+
+type HisPatientCaseHistory struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId            int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Temperature             float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	BloodSugar              float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	Pulse                   float64 `gorm:"column:pulse" json:"pulse" form:"pulse"`
+	Sbp                     float64 `gorm:"column:sbp" json:"sbp" form:"sbp"`
+	Dbp                     float64 `gorm:"column:dbp" json:"dbp" form:"dbp"`
+	Height                  float64 `gorm:"column:height" json:"height" form:"height"`
+	BloodFat                float64 `gorm:"column:blood_fat" json:"blood_fat" form:"blood_fat"`
+	SickType                int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	Symptom                 string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
+	SickDate                int64   `gorm:"column:sick_date" json:"sick_date" form:"sick_date"`
+	IsInfect                int64   `gorm:"column:is_infect" json:"is_infect" form:"is_infect"`
+	HistoryOfPresentIllness string  `gorm:"column:history_of_present_illness" json:"history_of_present_illness" form:"history_of_present_illness"`
+	PastHistory             string  `gorm:"column:past_history" json:"past_history" form:"past_history"`
+	Doctor                  int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ChiefConplaint          string  `gorm:"column:chief_conplaint" json:"chief_conplaint" form:"chief_conplaint"`
+	PersonalHistory         string  `gorm:"column:personal_history" json:"personal_history" form:"personal_history"`
+	FamilyHistory           string  `gorm:"column:family_history" json:"family_history" form:"family_history"`
+	Diagnostic              string  `gorm:"column:diagnostic" json:"diagnostic" form:"diagnostic"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	RecordDate              int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+}
+
+func (HisPatientCaseHistory) TableName() string {
+	return "his_patient_case_history"
+}
+
+type HisPatientInfo struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator      int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType     string `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PType        string `gorm:"column:p_type" json:"p_type" form:"p_type"`
+}
+
+func (HisPatientInfo) TableName() string {
+	return "his_patient_info"
+}
+
+type HisPrescription struct {
+	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 int64                     `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
+}
+
+func (HisPrescription) TableName() string {
+	return "his_prescription"
+}
+
+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"`
+}
+
+func (HisProject) TableName() string {
+	return "xt_his_project"
+}
+
+type HisProjectTeam struct {
+	ID          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price       float64 `gorm:"column:price" json:"price" form:"price"`
+	Pinyin      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType    int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+}
+
+func (HisProjectTeam) TableName() string {
+	return "xt_his_project_team"
+}
+
+type HisAdditionalCharge struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Price        float64 `gorm:"column:price" json:"price" form:"price"`
+	AdminUserId  int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate   int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	CreatedTime  int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	ItemName     string  `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	HisPatientId int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ItemId       int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Creator      int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier     int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+}
+
+func (HisAdditionalCharge) TableName() string {
+	return "his_additional_charge"
+}
+
+type HisDoctorAdviceParentTemplate struct {
+	ID                      int64                      `gorm:"column:id" json:"id" form:"id"`
+	OrgId                   int64                      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name                    string                     `gorm:"column:name" json:"name" form:"name"`
+	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"`
+	AdviceType              int64                      `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	HisDoctorAdviceTemplate []*HisDoctorAdviceTemplate `gorm:"ForeignKey:TemplateId;AssociationForeignKey:ID" json:"advices"`
+}
+
+func (HisDoctorAdviceParentTemplate) TableName() string {
+	return "his_doctor_advice_parent_template"
+}
+
+type HisDoctorAdviceTemplate struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	TemplateId            int64   `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDays              string  `gorm:"column:week_days" json:"week_days" form:"week_days"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	DrugNameId            int64   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+}
+
+func (HisDoctorAdviceTemplate) TableName() string {
+	return "his_doctor_advice_template"
+}
+
+type HisPrescriptionProject struct {
+	ID             int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId      int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price          float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId   int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate     int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+}
+
+func (HisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
+type SchedulesVm struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_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"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+}
+
+type HisProjectListVm struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	Number       int64   `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId    int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	Price        float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit         string  `gorm:"column:unit" json:"unit" form:"unit"`
+	ProjectName  string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	CostClassify int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+}
+
+type XtHisProjectList struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	Number      int64 `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId   int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId   int64 `gorm:"column:project_id" json:"project_id" form:"project_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"`
+}
+
+func (XtHisProjectList) TableName() string {
+	return "xt_his_project_list"
+}
+
+type XtHisPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+}
+
+func (XtHisPatient) TableName() string {
+	return "his_patient"
+}

routers/router.go

@@ -53,7 +53,7 @@ func init() {
 	controllers.PCIndexEvaluationApiControllersRegisterRouters()
 	controllers.ManagerCenterRegistRouters()
 	controllers.DrugStockManagerApiRegistRouters()
-	controllers.GdybRegistRouters()
+	controllers.HisManagerApiRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
 	new_m_api.NewMobileAPIControllersRegisterRouters()
@@ -71,4 +71,6 @@ func init() {
 	new_m_api.DialysisParameterApiControllersRegisterRouters()
 	controllers.SelfDrugRouters()
 	new_m_api.NewDrugApiControllersRegisterRouters()
+	controllers.HisProjectRouters()
+	controllers.GdybRegistRouters()
 }

service/dialysis_service.go

@@ -171,7 +171,6 @@ func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err err
 	return
 }
 
-
 //修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
@@ -981,8 +980,8 @@ func FindOrderInfoByGoodId(good_type_id int64, good_id int64, number string, org
 	return
 }
 
-func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, number string) (user models.AutomaticReduceDetail, err error) {
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND warehouse_out_order_number = ? ", good_id, good_type_id, id, org_id, number).First(&user).Error
+func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, record_time int64) (user models.AutomaticReduceDetail, err error) {
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND record_time = ? ", good_id, good_type_id, id, org_id, record_time).First(&user).Error
 	return
 }
 

service/doctor_advice_service.go

@@ -324,6 +324,9 @@ type DoctorAdvice struct {
 	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 }
 
 func (DoctorAdvice) TableName() string {

service/his_project_service.go

@@ -0,0 +1,309 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+func GetHisProjectIsExist(projectName string, orgid int64) (*models.XtHisProject, error) {
+
+	var project models.XtHisProject
+	var err error
+	err = XTReadDB().Model(&project).Where("project_name = ? and user_org_id = ? and status = 1", projectName, orgid).Find(&project).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &project, nil
+}
+
+func CreateHisProject(project *models.XtHisProject) error {
+
+	err := XTWriteDB().Model(&project).Create(&project).Error
+	return err
+}
+
+func GetHisProjectList(orgid int64, limit int64, page int64, start int64, charge int64, keyword string) (hisproject []*models.XtHisProject, total int64, err error) {
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("xt_his_project as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if start > 0 {
+		db = db.Where("x.medical_status = ?", start)
+	}
+	if charge > 0 {
+		db = db.Where("x.is_charge = ? ", charge)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("x.project_name like ?", likeKey)
+	}
+	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").Count(&total).Offset(offset).Limit(limit).Find(&hisproject).Error
+	return hisproject, total, err
+}
+
+func GetProjectDetail(id int64) (models.XtHisProject, error) {
+	project := models.XtHisProject{}
+	err := XTReadDB().Model(&project).Where("id=? and status = 1", id).Find(&project).Error
+	return project, err
+}
+
+func UpdatedProject(id int64, pro *models.XtHisProject) error {
+
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.MedicalCoverage, "disease_directory": pro.DiseaseDirectory, "is_record": pro.DiseaseDirectory, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.ExecutionFrequency, "number_days": pro.ExecutionFrequency, "total": pro.Total, "updated_time": pro.UpdatedTime}).Error
+	return err
+}
+
+func DeleteHisProject(id int64) error {
+	project := models.XtHisProject{}
+	err := XTWriteDB().Model(&project).Where("id=?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetHisProjectByNameOne(projectName string, orgid int64) (*models.XtHisProjectTeam, error) {
+
+	projectTeam := models.XtHisProjectTeam{}
+	err := XTReadDB().Model(&projectTeam).Where("project_team = ? and user_org_id = ? and status = 1", projectName, orgid).Find(&projectTeam).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &projectTeam, nil
+
+}
+
+func CreatedProjectTeam(team *models.XtHisProjectTeam) error {
+
+	err := XTWriteDB().Model(&team).Create(&team).Error
+	return err
+}
+
+func GetProjectTeamList(limit int64, page int64, orgid int64, keyword string) (projectTeam []*models.XtHisProjectTeam, total int64, err error) {
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&projectTeam)
+	if len(keyword) > 0 {
+		db = db.Where("project_team like ?", likeKey)
+	}
+	err = db.Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&projectTeam).Error
+	return projectTeam, total, err
+}
+
+func GetProjectTeamDetail(id int64) (models.XtHisProjectTeam, error) {
+
+	projectTeam := models.XtHisProjectTeam{}
+	err := XTReadDB().Model(&projectTeam).Where("id= ? and status = 1", id).Find(&projectTeam).Error
+	return projectTeam, err
+}
+
+func UpdatedProjectTeam(id int64, team *models.XtHisProjectTeam) error {
+
+	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId}).Error
+	return err
+}
+
+func DeleteProjectTeam(id int64) error {
+
+	team := models.XtHisProjectTeam{}
+	err := XTWriteDB().Model(&team).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateDePartment(department *models.XtHisDepartment) error {
+
+	err := XTWriteDB().Model(&department).Create(&department).Error
+	return err
+}
+
+func GetDepartMentList(limit int64, page int64, orgid int64) (departMent []*models.XtHisDepartment, total int64, err error) {
+
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&departMent).Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&departMent).Error
+	return departMent, total, err
+}
+
+func GetDepartMentDetail(id int64) (models.XtHisDepartment, error) {
+
+	department := models.XtHisDepartment{}
+	err := XTReadDB().Model(&department).Where("id=? and status = 1", id).Find(&department).Error
+	return department, err
+}
+
+func UpdatedDepartment(id int64, department *models.XtHisDepartment) error {
+
+	err := XTWriteDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"name": department.Name, "number": department.Number, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteDepartment(id int64) error {
+	department := models.XtHisDepartment{}
+	err := XTReadDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetBloodPatientList(orgid int64, startime int64) (schedule []*models.SchedulesVm, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.schedule_date = ?", startime)
+	}
+	err = db.Select("x.id,x.user_org_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,p.name,p.id_card_no").Joins("left join xt_patients as p on p.id = x.patient_id").Scan(&schedule).Error
+	return schedule, err
+}
+
+func GetHisPatient(orgid int64, recorddate int64) (paitent []*models.HisPatient, err error) {
+
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and record_date = ? and status = 1", orgid, recorddate).Find(&paitent).Error
+	return paitent, err
+}
+
+func GetHisPrescriptionOther(orgid int64, recorddate int64) (prescription []*models.HisPrescriptionVm, err error) {
+
+	db := XTReadDB().Table("his_prescription as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if recorddate > 0 {
+		db = db.Where("x.record_date = ? ", recorddate)
+	}
+	err = db.Select("x.id,x.user_org_id,x.record_date,x.patient_id,x.his_patient_id,x.number,x.type,x.doctor,x.creator,x.modifier,t.name").Joins("left join his_patient as t on t.id = x.his_patient_id").Scan(&prescription).Error
+	return prescription, err
+}
+
+func GetHisPrescriptionByPatientId(id int64, recordate int64) (prescription []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Model(&prescription).Where("his_patient_id = ? and record_date = ? and status= 1", id, recordate).Find(&prescription).Error
+	return prescription, err
+}
+
+func CreateAdditionalCharge(charge *models.HisAdditionalCharge) error {
+
+	err = XTWriteDB().Model(&charge).Create(&charge).Error
+	return err
+}
+
+func GetTreatmentList(id int64, startime int64) (prescription []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Model(&prescription).Where("id = ? and record_date = ? and status = 1", id, startime).Find(&prescription).Error
+	return prescription, err
+}
+
+//func GetAllProjectList(orgid int64) (project []*models.XtHisProject, err error) {
+//
+//	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
+//	return project, err
+//}
+
+func CreateProjectList(list *models.XtHisProjectList) error {
+
+	err := XTWriteDB().Model(&list).Create(&list).Error
+	return err
+}
+
+func GetHisProjectListByOrgId(orgid int64) (projectlist []*models.HisProjectListVm, err error) {
+
+	db := XTReadDB().Table("xt_his_project_list as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? ", orgid)
+	}
+	err = db.Select("x.id,x.number,x.user_org_id,x.project_id,t.price,t.unit,t.cost_classify,t.project_name").Joins("left join xt_his_project as t on t.id = x.project_id").Scan(&projectlist).Error
+	return projectlist, err
+}
+
+func GetHisPatientInformation(id int64) (models.HisPatient, error) {
+
+	patient := models.HisPatient{}
+	err := XTReadDB().Model(&patient).Where("id= ? and status = 1", id).Find(&patient).Error
+	return patient, err
+}
+
+func DeleteProjectList(id int64) error {
+	list := models.XtHisProjectList{}
+	err := XTWriteDB().Model(&list).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetHisProject(orgid int64) (project []*models.XtHisProject, err error) {
+
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1", orgid).Find(&project).Error
+	return project, err
+}
+
+func GetProjectTeam(ids []string, orgid int64) (project []*models.XtHisProject, err error) {
+
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and id in (?)", orgid, ids).Find(&project).Error
+	return project, err
+}
+
+func GetAllDepartMent(orgid int64) (department []*models.XtHisDepartment, err error) {
+
+	err = XTReadDB().Model(&department).Where("user_org_id = ? and status =1", orgid).Find(&department).Error
+	return department, err
+}
+
+func CreateHisPatient(patient *models.XtHisPatient) error {
+
+	err := XTReadDB().Model(&patient).Create(&patient).Error
+	return err
+}
+
+func GetBloodPatientByIdCard(idcard string, orgid int64) (*models.XtPatients, error) {
+	var patients models.XtPatients
+	var err error
+	err = XTReadDB().Model(&patients).Where("id_card_no = ? and user_org_id = ? and status = 1", idcard, orgid).Find(&patients).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &patients, nil
+}
+
+func GetAllProjectTeam(orgid int64) (project []*models.XtHisProjectTeam, err error) {
+
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
+	return project, err
+}
+
+func GetProjectListById(orgid int64, ids []string) (project []*models.XtHisProject, err error) {
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and id in (?)", orgid, ids).Find(&project).Error
+	return project, err
+}
+
+func GetHisPatientHistory(keyword string, startime int64, endtime int64, registtype int64, limit int64, page int64, orgid int64) (hisPatient []*models.XtHisPatient, total int64, err error) {
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("his_patient as x").Where("x.status = 1")
+
+	if len(keyword) > 0 {
+		db = db.Where("x.name like ?", likeKey)
+	}
+	if startime > 0 {
+		db = db.Where("x.record_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.record_date<=?", endtime)
+	}
+	if registtype > 0 {
+		db = db.Where("x.register_type = ?", registtype)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number").Count(&total).Offset(offset).Limit(limit).Find(&hisPatient).Error
+	return hisPatient, total, err
+}

service/his_service.go

@@ -0,0 +1,158 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
+
+type HisPatient struct {
+	ID              int64              `gorm:"column:id" json:"id" form:"id"`
+	Name            string             `gorm:"column:name" json:"name" form:"name"`
+	Gender          int64              `gorm:"column:gender" json:"gender" form:"gender"`
+	Total           float64            `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId       int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status          int64              `gorm:"column:status" json:"status" form:"status"`
+	RecordDate      int64              `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"prescription"`
+	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number          string             `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (HisPatient) TableName() string {
+	return "his_patient"
+}
+
+type Schedule struct {
+	ID              int64              `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status          int64              `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate    int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	Patients        Patients           `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
+	HisPatient      HisPatient         `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_patient"`
+	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
+}
+
+func (Schedule) TableName() string {
+	return "xt_schedule"
+}
+
+type Patients struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (Patients) TableName() string {
+	return "xt_patients"
+}
+
+type HisPrescription struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate   int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId int64 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (HisPrescription) TableName() string {
+	return "his_prescription"
+}
+
+func GetHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Schedule, err error) {
+	db := readDb.Model(&Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1", org_id)
+	err = db.Preload("HisPrescription", "user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+	return
+}
+
+func GetAllBaseDrugStockList(org_id int64) (drugs []*models.BaseDrugLib, err error) {
+	err = readDb.Model(&models.BaseDrugLib{}).Where("user_org_id = ? AND status = 1", org_id).Find(&drugs).Error
+	return
+}
+
+func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+}
+
+func GetXTPatientInfo(org_id int64, patient_id int64) (info models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1  AND id = ?", org_id, patient_id).First(&info).Error
+	return
+}
+
+func GetHisPatientCaseHistoryInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPatientCaseHistory, err error) {
+	err = readDb.Model(&models.HisPatientCaseHistory{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+}
+
+func GetHisPatientCaseHistoryList(org_id int64, patient_id int64) (caseHistorys []*models.HisPatientCaseHistory, err error) {
+	db := readDb.Model(&models.HisPatientCaseHistory{}).Where("user_org_id = ? AND status = 1  AND his_patient_id = ?", org_id, patient_id)
+	err = db.Find(&caseHistorys).Error
+	return
+}
+
+func GetHisPatientCaseHistoryTemplate(org_id int64) (caseHistorys []*models.HisCaseHistoryTemplate, err error) {
+	db := readDb.Model(&models.HisCaseHistoryTemplate{}).Where("user_org_id = ? AND status = 1", org_id)
+	err = db.Find(&caseHistorys).Error
+	return
+}
+
+func SaveHisPatientCaseHistoryTemplate(template models.HisCaseHistoryTemplate) (err error) {
+	err = writeDb.Create(&template).Error
+	return
+}
+
+func SaveHisPatientCaseHistory(caseHistory models.HisPatientCaseHistory) (err error) {
+	err = writeDb.Create(&caseHistory).Error
+	return
+}
+
+func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
+	err = writeDb.Create(&prescription).Error
+	return
+}
+
+func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ?", org_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
+		First(&prescription).Error
+	return
+}
+
+func GetAllDrugLibList(org_id int64) (list []*models.BaseDrugLib, err error) {
+	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
+	return
+}
+
+func GetAllProjectList(org_id int64) (list []*models.HisProject, err error) {
+	err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1", org_id).Find(&list).Error
+	return
+}
+
+func CreateAddtionalCharge(charge *models.HisAdditionalCharge) (err error) {
+	err = writeDb.Create(&charge).Error
+	return
+}
+
+func FindAllHisAdviceTemplate(org_id int64) (temps []*models.HisDoctorAdviceParentTemplate, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceParentTemplate{}).Preload("HisDoctorAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,way,drug_id,drug_name_id, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
+	}).Where("org_id = ? AND status=1 ", org_id).Find(&temps).Error
+	return
+}
+
+func GetHisAdminUserDoctors(org_id int64) (doctors []*models.UserAdminRole, err error) {
+	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND (user_type = 1 OR user_type = 2)", org_id).Find(&doctors).Error
+	return
+}
+
+func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
+	err = writeDb.Create(s).Error
+	return
+}

service/mobile_dialysis_service.go

@@ -639,6 +639,19 @@ func MobileGetDialysisPrescribe(orgID int64, patientID int64, recordDate int64)
 	return &record, nil
 }
 
+func MobileGetDialysisSchedual(orgID int64, patientID int64, scheduleDate int64) (*models.XtSchedule, error) {
+	var schedule models.XtSchedule
+	err := readDb.Model(&models.XtSchedule{}).Where("patient_id = ? and user_org_id = ? and status = 1 and schedule_date = ?", patientID, orgID, scheduleDate).First(&schedule).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &schedule, nil
+}
+
 // 透析方案
 func MobileGetDialysisSolution(orgID int64, patientID int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution

service/patient_service.go

@@ -547,7 +547,7 @@ func CreateDoctorAdvice(m *models.DoctorAdvice) (err error) {
 }
 func GetMaxAdviceGroupID(orgId int64) (group int64) {
 	var advice models.DoctorAdvice
-	err := readDb.Table("xt_doctor_advice").Where("user_org_id=?", orgId).Select("max(groupno) as groupno").First(&advice).Error
+	err := readDb.Table("his_doctor_advice_info").Where("user_org_id=?", orgId).Select("max(groupno) as groupno").First(&advice).Error
 	if err != nil {
 		fmt.Println(err)
 		group = 0
@@ -1369,3 +1369,39 @@ func FindDoctorAdviceByIdsTwo(orgID int64, ids []string) (advice []models.Doctor
 	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 AND (id IN (?) OR parent_id IN (?))", orgID, ids, ids).Find(&advice).Error
 	return
 }
+
+func CreateHisGroupAdvice(orgId int64, advices []*models.HisGroupAdvice, groupNo int64) (list []*models.HisGroupAdvice, err error) {
+	if groupNo <= 0 {
+		group := GetMaxAdviceGroupID(orgId)
+		groupNo = group + 1
+	}
+	tx := writeDb.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	for _, advice := range advices {
+		advice.Groupno = groupNo
+		if err = tx.Create(advice).Error; err != nil {
+			tx.Rollback()
+			return
+		}
+		list = append(list, advice)
+		if len(advice.Children) > 0 {
+			for _, child := range advice.Children {
+				child.Groupno = groupNo
+				child.ParentId = advice.ID
+				fmt.Println(child)
+				if err = tx.Create(&child).Error; err != nil {
+					tx.Rollback()
+					return
+				}
+				list = append(list, child)
+			}
+		}
+
+	}
+	tx.Commit()
+	return
+}

service/schedule_service.go

@@ -13,7 +13,7 @@ import (
 //GetSchedulePartitionPanel 取出排班面板，分区-机号
 func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err error) {
 
-	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
+	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Order("").Find(&partitions).Error
 
 	return
 }

service/self_drug_service.go

@@ -358,12 +358,12 @@ func GetAllPatientStockList(drug_name string, drug_spec string, startime int64,
 	if len(drug_spec) > 0 {
 		db = db.Where("x.drug_spec = ?", drug_spec)
 	}
-	if startime > 0 {
-		db = db.Where("x.storck_time >= ?", startime)
-	}
-	if endtime > 0 {
-		db = db.Where("x.storck_time <= ?", endtime)
-	}
+	//if startime > 0 {
+	//	db = db.Where("x.storck_time >= ?", startime)
+	//}
+	//if endtime > 0 {
+	//	db = db.Where("x.storck_time <= ?", endtime)
+	//}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -566,7 +566,7 @@ func (PrivateDrug) TableName() string {
 }
 
 func GetPrivateDrugList(patient_id int64, org_id int64) (pds []*PrivateDrug, err error) {
-	err = XTReadDB().Model(&PrivateDrug{}).Preload("PrivateDrug", "status = 1 AND user_org_id = ? AND patient_id = ? ", org_id, patient_id).Where("patient_id = ? and status = 1 AND user_org_id = ?", patient_id, org_id).Group("drug_name").Find(&pds).Error
+	err = XTReadDB().Model(&PrivateDrug{}).Preload("PrivateDrug", "status = 1 AND user_org_id = ? AND patient_id = ? ", org_id, patient_id).Where("patient_id = ? and status = 1 AND user_org_id = ?", patient_id, org_id).Group("drug_name_id").Find(&pds).Error
 	return
 }
 
@@ -583,18 +583,54 @@ func DeleteDrugNameById(id int64) (models.XtSelfMedical, error) {
 	return medical, err
 }
 
+func GetDrugNameIsExist(drugid int64, orgid int64) (*models.XtDrugName, error) {
+	drugName := models.XtDrugName{}
+	err := XTReadDB().Model(&drugName).Where("drug_id = ? and user_org_id = ? and status = 1", drugid, orgid).Find(&drugName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drugName, nil
+}
+
 func UpdatedDrugName(id int64, orgid int64, drugName *models.XtDrugName) error {
 
 	err := XTWriteDB().Model(&drugName).Where("drug_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": drugName.DrugName}).Error
 	return err
 }
 
+func GetStandNameIsExist(id int64, orgid int64) (*models.XtStandName, error) {
+	standName := models.XtStandName{}
+	err := XTReadDB().Model(&standName).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&standName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &standName, nil
+}
+
 func UpdateStandName(id int64, orgid int64, standName *models.XtStandName) error {
 
 	err := XTWriteDB().Model(&standName).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": standName.DrugName, "drug_spec": standName.DrugSpec, "drug_stock_limit": standName.DrugStockLimit, "min_unit": standName.MinUnit}).Error
 	return err
 }
 
+func GetSelfMedicalIsExist(id int64, orgid int64) (*models.XtSelfMedical, error) {
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status =1", id, orgid).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, nil
+}
+
 func UpdateSelfMedical(id int64, orgid int64, medical *models.XtSelfMedical) error {
 
 	err := XTWriteDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": medical.DrugName, "drug_spec": medical.DrugSpec, "execution_frequency": medical.ExecutionFrequency, "prescribing_number": medical.PrescribingNumber, "delivery_way": medical.DeliveryWay, "single_dose": medical.SingleDose, "min_unit": medical.MinUnit}).Error
@@ -608,23 +644,73 @@ func GetDrugNameId(id int64, orgid int64) (models.XtSelfMedical, error) {
 	return medical, err
 }
 
+func GetSelfStosckIsExist(id int64, orgid int64) (*models.XtSelfStock, error) {
+
+	medical := models.XtSelfStock{}
+	err := XTReadDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status  =1", id, orgid).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, nil
+}
+
 func UpdatedSelfStock(stock *models.XtSelfStock, id int64, orgid int64) error {
 	err := XTWriteDB().Model(&stock).Where("drug_name_id=? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "min_unit": stock.MinUnit, "drug_spec": stock.DrugSpec}).Error
 	return err
 }
 
+func GetOutSelfOutStockIsExist(id int64, orgid int64) (*models.XtSelfOutStock, error) {
+
+	outStock := models.XtSelfOutStock{}
+	err := XTReadDB().Model(&outStock).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&outStock).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &outStock, nil
+}
+
 func UpdatedOutSelfStock(stock *models.XtSelfOutStock, id int64, orgid int64) error {
 
 	err := XTWriteDB().Model(&stock).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "drug_spec": stock.DrugSpec}).Error
 	return err
 }
 
+func GetDoctorAdviceIsExist(id int64, orgid int64) (*models.DoctorAdvice, error) {
+	advice := models.DoctorAdvice{}
+	err := XTReadDB().Model(&advice).Where("drug_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&advice).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &advice, nil
+}
+
 func UpdateNoExcuteDoctorAdvice(id int64, orgid int64, advice *models.DoctorAdvice) error {
 
 	err := XTWriteDB().Model(&advice).Where("drug_id = ? and user_org_id = ? and status = 1 and  execution_state = 2", id, orgid).Updates(map[string]interface{}{"advice_name": advice.AdviceName, "advice_desc": advice.AdviceDesc, "single_dose": advice.SingleDose, "single_dose_unit": advice.SingleDoseUnit, "delivery_way": advice.DeliveryWay, "execution_frequency": advice.ExecutionFrequency}).Error
 	return err
 }
 
+func GetDoctorAdviceTemplateIsExist(id int64, orgid int64) (*models.DoctorAdviceTemplate, error) {
+	template := models.DoctorAdviceTemplate{}
+	err := XTReadDB().Model(&template).Where("drug_id = ? and org_id = ? and status = 1", id, orgid).Find(&template).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &template, nil
+}
+
 func UpdatedDoctorAdviceTemplate(id int64, orgid int64, template *models.DoctorAdviceTemplate) error {
 
 	err := XTWriteDB().Model(&template).Where("drug_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"advice_name": template.AdviceName, "advice_desc": template.AdviceDesc, "single_dose": template.SingleDose, "single_dose_unit": template.SingleDoseUnit, "delivery_way": template.DeliveryWay, "execution_frequency": template.ExecutionFrequency}).Error

service/stock_service.go

@@ -1874,8 +1874,8 @@ func FindGoodTypeByName(name string, org_id int64) (total int64) {
 	readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1 AND type_name = ? ", org_id, name).Count(&total)
 	return
 }
-func FindGoodInfoByName(name string, org_id int64) (total int64) {
-	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? ", org_id, name).Count(&total)
+func FindGoodInfoByName(name string, org_id int64, good_type_id int64) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? ", org_id, name, good_type_id).Count(&total)
 	return
 }