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

controllers/his_api_controller.go

@@ -731,6 +731,8 @@ func (c *HisApiController) CreateCaseHistoryTemplate() {
 	personal_history := c.GetString("personal_history")
 	family_history := c.GetString("family_history")
 	user_name := c.GetString("user_name")
+	doctor_advice := c.GetString("doctor_advice")
+	remark := c.GetString("remark")
 	//record_date := c.GetString("record_date")
 	//fmt.Println("record_date--------",record_date)
 	//timeLayout := "2006-01-02"
@@ -762,6 +764,8 @@ func (c *HisApiController) CreateCaseHistoryTemplate() {
 		Creator:                 doctor,
 		Modifier:                doctor,
 		UserName:                user_name,
+		DoctorAdvice:            doctor_advice,
+		Remark:                  remark,
 	}
 
 	err := service.SaveHisPatientCaseHistoryTemplate(template)

controllers/his_project_api_controller.go

@@ -80,6 +80,11 @@ func HisProjectRouters() {
 	beego.Router("/api/hispatient/getalldepartmentlist", &HisProjectApiController{}, "Get:GetAllDepartmentList")
 	beego.Router("/api/hispatient/getprescription", &HisProjectApiController{}, "Get:GetPrescription")
 	beego.Router("/api/histpatient/getpatientdetail", &HisProjectApiController{}, "Get:GetPatientDetail")
+	beego.Router("/api/hispatient/savemaintemplate", &HisProjectApiController{}, "Get:SaveMainTemplate")
+	beego.Router("/api/hispatient/getmedicaltemplatelist", &HisProjectApiController{}, "Get:GetMedicalTempalteList")
+	beego.Router("/api/hispatient/getmaintemplatebyid", &HisProjectApiController{}, "Get:GetMainTemplateById")
+	beego.Router("/api/hispatient/updatemaintemplate", &HisProjectApiController{}, "Get:UpdateMainTemplate")
+	beego.Router("/api/hispatient/deletemaintemplate", &HisProjectApiController{}, "Get:DeleteMainTemplate")
 }
 
 func (this *HisProjectApiController) SaveProject() {
@@ -932,8 +937,8 @@ func (this *HisProjectApiController) ChangePatient() {
 func (this *HisProjectApiController) GetPatientcaseHistory() {
 
 	patient_id, _ := this.GetInt64("patient_id")
-	patient, _ := service.GetBloodPatientInfoById(patient_id)
-	history, err := service.GetPatientCaseHistory(patient_id)
+	patient, err := service.GetBloodPatientInfoById(patient_id)
+	history, _ := service.GetPatientCaseHistory(patient_id)
 	hispatient, _ := service.GetHisPatientById(patient_id)
 
 	if err != nil {
@@ -972,6 +977,8 @@ func (this *HisProjectApiController) UpdateRecordTemplate() {
 	past_history := this.GetString("past_history")
 	personal_history := this.GetString("personal_history")
 	family_history := this.GetString("family_history")
+	doctor_advice := this.GetString("doctor_advice")
+	remark := this.GetString("remark")
 	adminUserInfo := this.GetAdminUserInfo()
 	creater := adminUserInfo.AdminUser.Id
 	historyTemplate := models.HisCaseHistoryTemplate{
@@ -987,6 +994,8 @@ func (this *HisProjectApiController) UpdateRecordTemplate() {
 		TemplateName:            template_name,
 		TemplateRemark:          template_remark,
 		Modifier:                creater,
+		DoctorAdvice:            doctor_advice,
+		Remark:                  remark,
 	}
 	err := service.UpdateCaseHistoryTemplate(&historyTemplate, id)
 	if err != nil {
@@ -1403,3 +1412,109 @@ func (this *HisProjectApiController) GetPatientDetail() {
 		"patient": patient,
 	})
 }
+
+func (this *HisProjectApiController) SaveMainTemplate() {
+
+	title := this.GetString("title")
+	content := this.GetString("content")
+	remark := this.GetString("remark")
+	template_id, _ := this.GetInt64("template_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	template := models.XtHisMedicalTemplate{
+		Title:      title,
+		Content:    content,
+		Remark:     remark,
+		UserOrgId:  orgId,
+		TemplateId: template_id,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+	}
+	err := service.CreateHisMedicalTemplate(&template)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+}
+
+func (this *HisProjectApiController) GetMedicalTempalteList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetMedicalTemplateList(orgId)
+	listOne, err := service.GetMedicalTemplateListOne(orgId)
+	listTwo, err := service.GetMedicalTemplateListTwo(orgId)
+	listThree, err := service.GetMedicalTemplateListThree(orgId)
+	listFour, err := service.GetMedicalTemplateListFour(orgId)
+	listFive, err := service.GetMedicalTemplateListFive(orgId)
+	listSix, err := service.GetMedicalTemplateListSix(orgId)
+	listSeven, err := service.GetMedicalTemplateListSeven(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":      list,
+		"listOne":   listOne,
+		"listTwo":   listTwo,
+		"listThree": listThree,
+		"listFour":  listFour,
+		"listFive":  listFive,
+		"listSix":   listSix,
+		"listSeven": listSeven,
+	})
+}
+
+func (this *HisProjectApiController) GetMainTemplateById() {
+
+	id, _ := this.GetInt64("id")
+	template, err := service.GetMainTemplateById(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+}
+
+func (this *HisProjectApiController) UpdateMainTemplate() {
+
+	title := this.GetString("title")
+	content := this.GetString("content")
+	remark := this.GetString("remark")
+	id, _ := this.GetInt64("id")
+
+	template := models.XtHisMedicalTemplate{
+		Title:   title,
+		Content: content,
+		Remark:  remark,
+	}
+
+	err := service.UpdateMainTemplate(&template, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+}
+
+func (this *HisProjectApiController) DeleteMainTemplate() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteMainTemplateById(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+
+}

models/his_models.go

@@ -158,6 +158,8 @@ type HisCaseHistoryTemplate struct {
 	Creator                 int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	UserName                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	DoctorAdvice            string `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	Remark                  string `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (HisCaseHistoryTemplate) TableName() string {
@@ -852,6 +854,22 @@ func (XtHisAdditionalCharge) TableName() string {
 	return "his_additional_charge"
 }
 
+type XtHisMedicalTemplate struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	Title      string `gorm:"column:title" json:"title" form:"title"`
+	Content    string `gorm:"column:content" json:"content" form:"content"`
+	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
+	TemplateId int64  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtHisMedicalTemplate) TableName() string {
+	return "xt_his_medical_template"
+}
+
 type HisXtDiagnoseConfig struct {
 	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
 	ClassName          string `gorm:"column:class_name" json:"class_name" form:"class_name"`

service/his_project_service.go

@@ -377,7 +377,7 @@ func GetTemplateDetail(id int64) (models.HisCaseHistoryTemplate, error) {
 
 func UpdateCaseHistoryTemplate(tem *models.HisCaseHistoryTemplate, id int64) error {
 
-	err := XTWriteDB().Model(&tem).Where("id = ? ", id).Updates(map[string]interface{}{"history_of_present_illness": tem.HistoryOfPresentIllness, "past_history": tem.PastHistory, "chief_conplaint": tem.ChiefConplaint, "personal_history": tem.PersonalHistory, "family_history": tem.FamilyHistory, "diagnostic": tem.Diagnostic, "template_name": tem.TemplateName, "template_remark": tem.TemplateRemark, "modifier": tem.Modifier}).Error
+	err := XTWriteDB().Model(&tem).Where("id = ? ", id).Updates(map[string]interface{}{"history_of_present_illness": tem.HistoryOfPresentIllness, "past_history": tem.PastHistory, "chief_conplaint": tem.ChiefConplaint, "personal_history": tem.PersonalHistory, "family_history": tem.FamilyHistory, "diagnostic": tem.Diagnostic, "template_name": tem.TemplateName, "template_remark": tem.TemplateRemark, "modifier": tem.Modifier, "doctor_advice": tem.DoctorAdvice, "remark": tem.Remark}).Error
 	return err
 }
 
@@ -602,3 +602,78 @@ func GetTodayHisPatient(recod_date int64, patientid int64, user_org_id int64) (*
 	}
 	return &patient, nil
 }
+
+func CreateHisMedicalTemplate(template *models.XtHisMedicalTemplate) error {
+
+	err := XTWriteDB().Create(&template).Error
+	return err
+}
+
+func GetMedicalTemplateList(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 1", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListOne(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 2", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListTwo(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 3", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListThree(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 4", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListFour(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 5", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListFive(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 6", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListSix(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 7", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMedicalTemplateListSeven(orgid int64) (template []*models.XtHisMedicalTemplate, err error) {
+
+	err = XTReadDB().Model(&template).Where("user_org_id =? and status = 1 and template_id = 8", orgid).Find(&template).Error
+	return template, err
+}
+
+func GetMainTemplateById(id int64) (models.XtHisMedicalTemplate, error) {
+
+	template := models.XtHisMedicalTemplate{}
+	err := XTReadDB().Model(&template).Where("id=? and status = 1", id).Find(&template).Error
+	return template, err
+}
+
+func UpdateMainTemplate(template *models.XtHisMedicalTemplate, id int64) error {
+
+	err := XTWriteDB().Model(&template).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": template.Title, "content": template.Content, "remark": template.Remark, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteMainTemplateById(id int64) error {
+
+	template := models.XtHisMedicalTemplate{}
+	err := XTWriteDB().Model(&template).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+
+}

service/stock_service.go

@@ -1148,10 +1148,14 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 
 	db := readDb.Model(&models.StockInfo{})
 	if startime > 0 {
-		db = db.Where("ctime >=?", startime)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and sys_record_time>=?", orgId, startime)
+		})
 	}
 	if endtime > 0 {
-		db = db.Where("ctime<=?", endtime)
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1 and sys_record_time>=? and  sys_record_time<=?", orgId, startime, endtime)
+		})
 	}
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
 	db = db.Group("xt_good_information.id")