Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/data_api_controller.go

@@ -51,15 +51,13 @@ func DataApiRegistRouters() {
 	beego.Router("/article/hanleupdatetwo", &DataApiController{}, "Get:GetHandleData")
 	beego.Router("/article/updatedatatwo", &DataApiController{}, "Post:UpdateDataTwo")
 
-	//beego.Router("/api/dictionary/getconfiglist", &DataApiController{}, "get,post:GetDictionaryConfigList")
-
 	beego.Router("/api/hisadvicetemplate/create", &DataApiController{}, "Post:CreateHisAdviceTemplate")
-	beego.Router("/api/hissubadvice/create", &DataApiController{}, "Post:CreateHisubAdviceTemplate")
 	beego.Router("/api/hisadvicetemplate/update", &DataApiController{}, "Put:UpdateHisAdviceTemplate")
 	beego.Router("/api/hisadvicetemplate/delete", &DataApiController{}, "Delete:DeleteHisAdviceTemplate")
-	//beego.Router("/api/hisadvicetemplate/add", &DataApiController{}, "Post:CreateSingleHisAdviceTemplate")
-	//beego.Router("/api/hisadviceparenttemplate/delete", &DataApiController{}, "Delete:DeleteHisParentAdviceTemplate")
-	//beego.Router("/api/histemplate/modify", &DataApiController{}, "Post:ModifyHisTemplateName")
+	beego.Router("/api/hisadvicetemplate/add", &DataApiController{}, "Post:CreateSingleHisAdviceTemplate")
+	beego.Router("/api/hisadviceparenttemplate/delete", &DataApiController{}, "Delete:DeleteHisParentAdviceTemplate")
+	beego.Router("/api/histemplate/modify", &DataApiController{}, "Post:ModifyHisTemplateName")
+	beego.Router("/api/getallhisadvicetemplate", &DataApiController{}, "Get:GetAllHisAdviceTemplate")
 
 }
 
@@ -1439,21 +1437,350 @@ func (c *DataApiController) UpdateDataTwo() {
 }
 
 func (c *DataApiController) CreateHisAdviceTemplate() {
+	templateName := c.GetString("template_name")
+	advice_type, _ := c.GetInt64("advice_type")
+
+	if templateName == "" {
+		utils.ErrorLog("模版名称不能为空")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamEmptyWrong)
+		return
+	}
+	if advice_type < 0 {
+		utils.ErrorLog("医嘱模版类型不能为空")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceTypeWrong)
+		return
+	}
+	adminUserInfo := c.GetAdminUserInfo()
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
+	if appRole.UserType == 3 {
+		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		if getPermissionErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		} else if headNursePermission == nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateAdvice)
+			return
+		}
+	}
+	template := &models.HisDoctorAdviceParentTemplate{
+		Name:        templateName,
+		OrgId:       adminUserInfo.CurrentOrgId,
+		Status:      1,
+		CreatedTime: time.Now().Unix(),
+		UpdatedTime: time.Now().Unix(),
+		AdviceType:  advice_type,
+	}
+	createErr := service.CreateHisDoctorAdviceTemplate(template)
+	if createErr != nil {
+		utils.ErrorLog("%v", createErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	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 subTemplate []*models.HisDoctorAdviceTemplate
+	if dataBody["data"] != nil && reflect.TypeOf(dataBody["data"]).String() == "[]interface {}" {
+		subTemp, _ := dataBody["data"].([]interface{})
+		if len(subTemp) > 0 {
+			for _, item := range subTemp {
+				items := item.(map[string]interface{})
+				if items["advice_name"] == nil || reflect.TypeOf(items["advice_name"]).String() != "string" {
+					utils.ErrorLog("advice_name")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				advice_name, _ := items["advice_name"].(string)
+				advice_desc, _ := items["advice_desc"].(string)
+				single_dose_unit, _ := items["single_dose_unit"].(string)
+				prescribing_number_unit, _ := items["prescribing_number_unit"].(string)
+				delivery_way, _ := items["delivery_way"].(string)
+				execution_frequency, _ := items["execution_frequency"].(string)
+				drug_spec, _ := items["drug_spec"].(string)
+				drug_spec_unit, _ := items["drug_spec_unit"].(string)
+				single_dose := items["single_dose"].(float64)
+				prescribing_number := items["prescribing_number"].(float64)
+				drug_id := int64(items["drug_id"].(float64))
+
+				subTemps := &models.HisDoctorAdviceTemplate{
+					AdviceName:            advice_name,
+					Status:                1,
+					CreatedTime:           time.Now().Unix(),
+					UpdatedTime:           time.Now().Unix(),
+					OrgId:                 adminUserInfo.CurrentOrgId,
+					AdviceDesc:            advice_desc,
+					AdviceType:            advice_type,
+					SingleDoseUnit:        single_dose_unit,
+					PrescribingNumber:     prescribing_number,
+					PrescribingNumberUnit: prescribing_number_unit,
+					DeliveryWay:           delivery_way,
+					ExecutionFrequency:    execution_frequency,
+					TemplateId:            template.ID,
+					DrugSpec:              drug_spec,
+					DrugSpecUnit:          drug_spec_unit,
+					SingleDose:            single_dose,
+					AdviceDoctor:          adminUserInfo.AdminUser.Id,
+					DrugId:                drug_id,
+				}
+				subTemplate = append(subTemplate, subTemps)
 
+			}
+		}
+	}
+	//errs := service.CreateBatchRecord(subTemplate)
+	errs := service.CreateHisSubDoctorAdviceTemplate(subTemplate)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+		return
+	}
+	templates, _ := service.FindHisDoctorAdviceTemplateById(template.ID, adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": templates,
+	})
+	return
 }
+func (c *DataApiController) UpdateHisAdviceTemplate() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	id, _ := c.GetInt64("id", 0)
+
+	if id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	template, _ := service.FindHisAdviceTemplate(adminUserInfo.CurrentOrgId, id)
+	if template == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBSelectNoResult)
+		return
+	}
+
+	var templatedata models.HisDoctorAdviceTemplate
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &templatedata)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 
-func (c *DataApiController) CreateSHisubAdviceTemplate() {
+	if templatedata.AdviceName == "" {
+		utils.ErrorLog("不能为空")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeNow := time.Now().Unix()
+	template.UpdatedTime = timeNow
+	template.AdviceName = templatedata.AdviceName
+	template.AdviceDesc = templatedata.AdviceDesc
+	template.SingleDose = templatedata.SingleDose
+	template.SingleDoseUnit = templatedata.SingleDoseUnit
+	template.PrescribingNumber = templatedata.PrescribingNumber
+	template.PrescribingNumberUnit = templatedata.PrescribingNumberUnit
+	template.DrugSpec = templatedata.DrugSpec
+	template.DrugSpecUnit = templatedata.DrugSpecUnit
+	template.DeliveryWay = templatedata.DeliveryWay
+	template.ExecutionFrequency = templatedata.ExecutionFrequency
+	template.DrugId = template.DrugId
+
+	err = service.UpdateHisAdviceTemplate(template)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+		return
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+	return
 
 }
+func (c *DataApiController) DeleteHisAdviceTemplate() {
+	adminUserInfo := c.GetAdminUserInfo()
+	parent_id, _ := c.GetInt64("parent_id", 0)
+	id, _ := c.GetInt64("id", 0)
+
+	if id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	template, _ := service.FindHisAdviceTemplate(adminUserInfo.CurrentOrgId, id)
+	if template == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBSelectNoResult)
+		return
+	}
 
-func (c *DataApiController) CreateHisubAdviceTemplate() {
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
+	//		return
+	//	}
+	//}
 
+	timeNow := time.Now().Unix()
+	template.ID = id
+	template.UpdatedTime = timeNow
+	template.ParentId = parent_id
+	template.Status = 2
+
+	if parent_id > 0 { //删除子医嘱
+		err := service.UpdateHisAdviceTemplate(template)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
+			return
+		}
+	} else { //删除该医嘱下的所有子医嘱
+		err := service.UpdateHisAdviceAndSubAdviceTemplate(template)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
+			return
+		}
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
 }
+func (c *DataApiController) CreateSingleHisAdviceTemplate() {
+	drug_spec := c.GetString("drug_spec")
+	drug_spec_unit := c.GetString("drug_spec_unit")
+	advice_name := c.GetString("advice_name")
+	advice_desc := c.GetString("advice_desc")
+	single_dose, _ := c.GetFloat("single_dose", 0)
+	single_dose_unit := c.GetString("single_dose_unit")
+	prescribing_number, _ := c.GetFloat("prescribing_number", 0)
+	prescribing_number_unit := c.GetString("prescribing_number_unit")
+	delivery_way := c.GetString("delivery_way")
+	execution_frequency := c.GetString("execution_frequency")
+	template_id, _ := c.GetInt64("template_id", -1)
+	drug_id, _ := c.GetInt64("drug_id")
+	adminUserInfo := c.GetAdminUserInfo()
 
-func (c *DataApiController) UpdateHisAdviceTemplate() {
+	template := models.HisDoctorAdviceTemplate{
+		OrgId:                 adminUserInfo.CurrentOrgId,
+		AdviceDoctor:          adminUserInfo.AdminUser.Id,
+		Status:                1,
+		CreatedTime:           time.Now().Unix(),
+		UpdatedTime:           time.Now().Unix(),
+		DrugSpec:              drug_spec,
+		DrugSpecUnit:          drug_spec_unit,
+		AdviceName:            advice_name,
+		AdviceDesc:            advice_desc,
+		SingleDose:            single_dose,
+		SingleDoseUnit:        single_dose_unit,
+		PrescribingNumber:     prescribing_number,
+		PrescribingNumberUnit: prescribing_number_unit,
+		DeliveryWay:           delivery_way,
+		ExecutionFrequency:    execution_frequency,
+		TemplateId:            template_id,
+		DrugId:                drug_id,
+	}
+
+	if template.AdviceName == "" {
+		utils.ErrorLog("医嘱名字不能为空")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamAdviceEmptyWrong)
+		return
+	}
 
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
+	if appRole.UserType == 3 {
+		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+		if getPermissionErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		} else if headNursePermission == nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateAdvice)
+			return
+		}
+	}
+	err := service.CreateHisAdviceTemplate(&template)
+	if err != nil {
+		utils.ErrorLog("%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+	return
 }
+func (c *DataApiController) DeleteHisParentAdviceTemplate() {
+	template_id, _ := c.GetInt64("template_id", 0)
+	adminUserInfo := c.GetAdminUserInfo()
+	_, err := service.FindParentHisTemplateRecordById(adminUserInfo.CurrentOrgId, template_id)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	err1 := service.DeleteHisParentDoctorAdviceByTemplateId(template_id, adminUserInfo.CurrentOrgId)
+	if err1 != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "删除成功",
+	})
+}
+func (this *DataApiController) ModifyHisTemplateName() {
+	template_name := this.GetString("template_name")
+	template_id, _ := this.GetInt64("template_id", 0)
 
-func (c *DataApiController) DeleteHisAdviceTemplate() {
+	if len(template_name) <= 0 {
+		utils.ErrorLog("模版名字不能为空")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamEmptyWrong)
+		return
+	}
+
+	if template_id == 0 {
+		utils.ErrorLog("模版不存在")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamTemplateNOEXISTWrong)
+		return
+	}
+	adminUserInfo := this.GetAdminUserInfo()
+	template, _ := service.FindParentHisTemplateRecordById(adminUserInfo.CurrentOrgId, template_id)
+	var err error
+	if template.Name == template_name {
+		err = service.ModifyTemplateName(template_id, template_name)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+			return
+		}
+	} else {
+		err = service.ModifyHisTemplateName(template_id, template_name)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+			return
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"template_name": template_name,
+		"template_id":   template_id,
+	})
+
+}
+func (this *DataApiController) GetAllHisAdviceTemplate() {
+	adminUserInfo := this.GetAdminUserInfo()
+	drugs, _ := service.GetAllDrugLibs(adminUserInfo.CurrentOrgId)
+	drugways, _, _ := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminUserInfo.CurrentOrgId)
+	adviceTemplates, _ := service.FindHisAllAdviceTemplate(adminUserInfo.CurrentOrgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugways":         drugways,
+		"efs":              efs,
+		"advice_templates": adviceTemplates,
+		"drugs":            drugs,
+	})
 
 }

controllers/his_api_controller.go

@@ -82,6 +82,12 @@ func (c *HisApiController) GetHisPatientList() {
 	var total_one int64
 	var total_two int64
 
+	//获取当前用户的信息
+	adminUserInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
+	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+
 	for _, item := range patients {
 
 		if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
@@ -94,9 +100,12 @@ func (c *HisApiController) GetHisPatientList() {
 
 	if types == 0 {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list":      patients,
-			"total_one": total_one,
-			"total_two": total_two,
+			"list":       patients,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
 		})
 
 	} else if types == 1 { //未就诊
@@ -107,9 +116,12 @@ func (c *HisApiController) GetHisPatientList() {
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list":      patientsOne,
-			"total_one": total_one,
-			"total_two": total_two,
+			"list":       patientsOne,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
 		})
 
 	} else if types == 2 { //已就诊
@@ -121,9 +133,12 @@ func (c *HisApiController) GetHisPatientList() {
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list":      patientsTwo,
-			"total_one": total_one,
-			"total_two": total_two,
+			"list":       patientsTwo,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
 		})
 	}
 
@@ -182,9 +197,6 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
-	//获取当前用户的信息
-	adminUserInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugs":            drugs,
 		"advices_template": advices,
@@ -193,7 +205,6 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		"doctors":          doctors,
 		"department":       department,
 		"sick":             sick,
-		"info":             adminUserInfo,
 		"additions":        additions,
 	})
 }

models/his_models.go

@@ -249,26 +249,28 @@ func (HisPatientCaseHistory) TableName() string {
 }
 
 type HisPrescriptionInfo 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"`
-	RegisterType       string          `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	PrescriptionNumber string          `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	PrescriptionStatus int64           `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
+	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"`
+	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+
+	XtHisDepartment XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 }
 
 func (HisPrescriptionInfo) TableName() string {

service/doctor_advice_service.go

@@ -117,6 +117,11 @@ func CreateAdviceTemplate(d *models.DoctorAdviceTemplate) (err error) {
 	return
 }
 
+func CreateHisAdviceTemplate(d *models.HisDoctorAdviceTemplate) (err error) {
+	err = readDb.Create(&d).Error
+	return
+}
+
 func FindAdviceTemplate(orgid, id int64) (*models.DoctorAdviceTemplate, error) {
 	var template models.DoctorAdviceTemplate
 	err := readDb.Model(&models.DoctorAdviceTemplate{}).Where("id=? and org_id =? and status=1", id, orgid).First(&template).Error
@@ -130,22 +135,97 @@ func FindAdviceTemplate(orgid, id int64) (*models.DoctorAdviceTemplate, error) {
 	return &template, nil
 }
 
+func FindHisAdviceTemplate(orgid, id int64) (*models.HisDoctorAdviceTemplate, error) {
+	var template models.HisDoctorAdviceTemplate
+	err := readDb.Model(&models.HisDoctorAdviceTemplate{}).Where("id=? and org_id =? and status=1", id, orgid).First(&template).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return &template, nil
+}
+
 func UpdateAdviceTemplate(d *models.DoctorAdviceTemplate) (err error) {
 	err = writeDb.Save(&d).Error
 	return
 }
 
+func UpdateHisAdviceTemplate(d *models.HisDoctorAdviceTemplate) (err error) {
+	err = writeDb.Save(&d).Error
+	return
+}
+
 func UpdateAdviceAndSubAdviceTemplate(d *models.DoctorAdviceTemplate) (err error) {
 	err = writeDb.Save(&d).Error
 	err = writeDb.Model(&models.DoctorAdviceTemplate{}).Where("status=1 AND parent_id = ?", d.ID).Updates(map[string]interface{}{"status": 2, "updated_time": time.Now().Unix()}).Error
 	return
 }
 
+func UpdateHisAdviceAndSubAdviceTemplate(d *models.HisDoctorAdviceTemplate) (err error) {
+	err = writeDb.Save(&d).Error
+	err = writeDb.Model(&models.HisDoctorAdviceTemplate{}).Where("status=1 AND parent_id = ?", d.ID).Updates(map[string]interface{}{"status": 2, "updated_time": time.Now().Unix()}).Error
+	return
+}
+
 func CreateTemplate(template *models.DoctorAdviceParentTemplate) (err error) {
 	err = readDb.Create(&template).Error
 	return
 }
 
+func CreateHisDoctorAdviceTemplate(template *models.HisDoctorAdviceParentTemplate) (err error) {
+	err = readDb.Create(&template).Error
+	return
+}
+
+func CreateHisSubDoctorAdviceTemplate(template []*models.HisDoctorAdviceTemplate) (err error) {
+	if len(template) > 0 {
+		utx := writeDb.Begin()
+		if len(template) > 0 {
+			thisSQL := "INSERT INTO his_doctor_advice_template (org_id, advice_name, advice_desc, single_dose, single_dose_unit,prescribing_number," +
+				"prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range template {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.OrgId)
+				insertData = append(insertData, info.AdviceName)
+				insertData = append(insertData, info.AdviceDesc)
+				insertData = append(insertData, info.SingleDose)
+				insertData = append(insertData, info.SingleDoseUnit)
+				insertData = append(insertData, info.PrescribingNumber)
+				insertData = append(insertData, info.PrescribingNumberUnit)
+				insertData = append(insertData, info.DeliveryWay)
+				insertData = append(insertData, info.ExecutionFrequency)
+				insertData = append(insertData, info.AdviceDoctor)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.CreatedTime)
+				insertData = append(insertData, info.UpdatedTime)
+				insertData = append(insertData, info.TemplateId)
+				insertData = append(insertData, info.DrugSpec)
+				insertData = append(insertData, info.DrugSpecUnit)
+				insertData = append(insertData, info.AdviceType)
+				insertData = append(insertData, info.DayCount)
+				insertData = append(insertData, info.WeekDays)
+				insertData = append(insertData, info.FrequencyType)
+				insertData = append(insertData, info.DrugId)
+				insertData = append(insertData, info.Way)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}
+
 //func CreateBatchRecord(template []*models.DoctorAdviceTemplate) (err error) {
 //	err = writeDb.Create(template).Error
 //	return
@@ -202,6 +282,11 @@ func FindDoctorAdviceTemplateById(id int64, org_id int64) (temps models.DoctorAd
 	return
 }
 
+func FindHisDoctorAdviceTemplateById(id int64, org_id int64) (temps models.HisDoctorAdviceParentTemplate, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceParentTemplate{}).Preload("HisDoctorAdviceTemplate", "status = 1").Where("org_id = ? AND status=1 AND id = ?", org_id, id).Order("id desc").First(&temps).Error
+	return
+}
+
 func FindAllAdviceTemplate(org_id int64, advice_type int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", 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")
@@ -229,6 +314,11 @@ func FindParentTemplateRecordById(orgid int64, template_id int64) (parentTemplat
 	return
 }
 
+func FindParentHisTemplateRecordById(orgid int64, template_id int64) (parentTemplate models.HisDoctorAdviceParentTemplate, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceParentTemplate{}).Where("id = ? AND org_id = ? AND status= 1 ", template_id, orgid).First(&parentTemplate).Error
+	return
+}
+
 func DeleteParentDoctorAdviceByTemplateId(template_id int64, org_id int64) (err error) {
 
 	ut := writeDb.Begin()
@@ -247,11 +337,34 @@ func DeleteParentDoctorAdviceByTemplateId(template_id int64, org_id int64) (err
 	return err
 }
 
+func DeleteHisParentDoctorAdviceByTemplateId(template_id int64, org_id int64) (err error) {
+
+	ut := writeDb.Begin()
+	err = writeDb.Model(&models.HisDoctorAdviceParentTemplate{}).Where("status=1 AND id = ? AND org_id = ?", template_id, org_id).Updates(map[string]interface{}{"status": "0", "updated_time": time.Now().Unix()}).Error
+
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	err = writeDb.Model(&models.HisDoctorAdviceTemplate{}).Where("status=1 AND template_id = ? AND org_id = ?", template_id, org_id).Updates(map[string]interface{}{"status": "2", "updated_time": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+	return err
+}
+
 func ModifyTemplateName(id int64, template_name string) (err error) {
 	err = writeDb.Model(&models.DoctorAdviceParentTemplate{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"name": template_name, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
+func ModifyHisTemplateName(id int64, template_name string) (err error) {
+	err = writeDb.Model(&models.HisDoctorAdviceParentTemplate{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"name": template_name, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
 func FindOtherAllAdviceTemplate(org_id int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", 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,drug_id,way, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
@@ -261,6 +374,15 @@ func FindOtherAllAdviceTemplate(org_id int64) (temps []*models.DoctorAdviceParen
 
 }
 
+func FindHisAllAdviceTemplate(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,drug_id,way, 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
+	//.Scan(&advices).Error
+
+}
+
 func GetHandleData(id int64) (models.ConfigViewModel, error) {
 	config := models.ConfigViewModel{}
 	err := readDb.Model(&config).Where("id=?", id).Find(&config).Error

service/his_service.go

@@ -59,6 +59,7 @@ type VMHisPrescriptionInfo struct {
 	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
 }
 
 func (VMHisPrescriptionInfo) TableName() string {
@@ -323,6 +324,12 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 	return
 }
 
+func GetAllDrugLibs(org_id int64) (drugs []*Drugs, err error) {
+	db := readDb.Model(&models.BaseDrugLib{}).Preload("Drugs", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Where("org_id = ?  AND status = 1 AND find_in_set('停用',drug_status) = 0", org_id).Group("drug_name")
+	err = db.Find(&drugs).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
@@ -519,6 +526,7 @@ type HisPrescriptionInfo struct {
 	BatchNumber           string                       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionStatus    int64                        `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	DoctorId              int64                        `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId          int64                        `gorm:"column:department_id" json:"department_id" form:"department_id"`
 }
 
 func (HisPrescriptionInfo) TableName() string {