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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode = prod
 
 #
 copyrequestbody = true

controllers/base_api_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
+
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -67,33 +69,33 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
 
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()
@@ -313,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_api_controller.go

@@ -2520,7 +2520,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	dialysisway, err := service.FindDialysisWay(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取临时医嘱
 	doctorAdvice, _ := service.FindDoctorOrder(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	config, err := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
+	//config, err := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
@@ -2576,6 +2576,33 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	//获取his数据
 	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	//hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	config, _ := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
+
+	project_config, _ := service.GetHisProjectConfig(adminUserInfo.CurrentOrgId)
+	projects, _ := service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
+		for _, item := range projects {
+			var advice *models.HisDoctorAdviceInfo
+			advice.ID = item.ID
+			advice.Checker = item.Checker
+			advice.CheckTime = item.CheckTime
+			advice.CheckState = item.CheckState
+			advice.ExecutionState = item.ExecutionState
+			advice.ExecutionStaff = item.ExecutionStaff
+			advice.PrescribingNumber = float64(item.Count)
+			advice.PrescribingNumberUnit = item.Unit
+			advice.AdviceDoctor = item.Doctor
+			if item.Type == 3 {
+				advice.AdviceName = item.GoodInfo.GoodName
+			} else if item.Type == 2 {
+				advice.AdviceName = item.HisProject.ProjectName
+			}
+			advice.StartTime = item.StartTime
+			hisAdvice = append(hisAdvice, advice)
+		}
+	}
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"xtdate":                    xtdate,

controllers/doctors_api_controller.go

@@ -103,7 +103,7 @@ func (c *DoctorsApiController) GetAllDoctorAndNurse() {
 func (c *DoctorsApiController) GetAllAdminUsers() {
 
 	adminUserInfo := c.GetAdminUserInfo()
-	users, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	users, _ := service.GetAllAdminUsersTwo(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"users": users,
 	})

controllers/gobal_config_api_controller.go

@@ -67,6 +67,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
 	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
 
+	beego.Router("/api/xtconfigproject/isopen", &GobalConfigApiController{}, "post:PostXTHisProjectConfig")
+
 	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")
 
 	beego.Router("/api/passdetail/export", &GobalConfigApiController{}, "get:GetPassExportData")
@@ -1384,20 +1386,80 @@ func (c *GobalConfigApiController) PostXTHisConfig() {
 
 	return
 }
+
+func (c *GobalConfigApiController) PostXTHisProjectConfig() {
+	is_open, _ := c.GetBool("is_open", false)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	isOpen := 0
+
+	if is_open {
+		isOpen = 1
+	} else {
+		isOpen = 2
+	}
+
+	config := models.XtHisProjectConfig{
+		UserOrgId: org_id,
+		IsOpen:    int64(isOpen),
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	errs, configs := service.FindXTHisProjectByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreateXTHisProjectRecord(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	} else if errs == nil {
+		modifyConfig := models.XtHisProjectConfig{
+			ID:        configs.ID,
+			UserOrgId: org_id,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			IsOpen:    int64(isOpen),
+		}
+
+		err := service.UpdateXTHisProjectRecord(&modifyConfig)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open": is_open,
+	})
+
+	return
+}
+
 func (c *GobalConfigApiController) GetXTHisConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
+	_, project_config := service.FindXTHisProjectByOrgId(adminUserInfo.CurrentOrgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"config": config,
+		"config":         config,
+		"project_config": project_config,
 	})
 }
 
 func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
+	_, project_config := service.FindXTHisProjectByOrgId(adminUserInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"is_open_xt_his": config.IsOpen,
+		"is_open_xt_his":         config.IsOpen,
+		"is_open_xt_his_project": project_config.IsOpen,
 	})
 
 }
@@ -1409,6 +1471,8 @@ func (c *GobalConfigApiController) GetPassExportData() {
 func (c *GobalConfigApiController) GetExportData() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	p_type, _ := c.GetInt64("p_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1432,7 +1496,7 @@ func (c *GobalConfigApiController) GetExportData() {
 		endTime = theTime.Unix()
 	}
 	adminInfo := c.GetAdminUserInfo()
-	order, _ := service.GetExportHisOrderList(adminInfo.CurrentOrgId, startTime, endTime)
+	order, _ := service.GetExportHisOrderList(adminInfo.CurrentOrgId, startTime, endTime, p_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order": order,
 	})

controllers/his_config_api_controller.go

@@ -0,0 +1,403 @@
+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 HisConfigApiController struct {
+	BaseAuthAPIController
+}
+
+func HisConfigApiRegistRouters() {
+	beego.Router("/api/his/patient/list", &HisConfigApiController{}, "get:GetAllHisPatientsList")
+	beego.Router("/api/his/prescriptiontemplate/list", &HisConfigApiController{}, "get:GetPrescriptionTemplateList")
+	beego.Router("/api/his/prescriptiontemplate/info", &HisConfigApiController{}, "get:GetPrescriptionTemplateInfo")
+	beego.Router("/api/his/prescriptiontemplate/create", &HisConfigApiController{}, "post:CreatePrescriptionTemplate")
+	beego.Router("/api/his/prescriptiontemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionTemplate")
+	beego.Router("/api/his/prescriptioninfotemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionInfoTemplate")
+	beego.Router("/api/his/advicetemplate/delete", &HisConfigApiController{}, "post:DeleteAdviceTemplate")
+	beego.Router("/api/his/projecttemplate/delete", &HisConfigApiController{}, "post:DeleteProjectTemplate")
+
+}
+
+func (c *HisConfigApiController) GetAllHisPatientsList() {
+	patients, _, _ := service.GetAllPatientList(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+	})
+}
+
+func (c *HisConfigApiController) GetPrescriptionTemplateList() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	page, _ := c.GetInt64("page", 0)
+	limit, _ := c.GetInt64("limit", 0)
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	if patient_id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	templates, total, _ := service.GetHisPrescriptionTemplatesList(patient_id, c.GetAdminUserInfo().CurrentOrgId, page, limit)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  templates,
+		"total": total,
+	})
+
+}
+
+func (c *HisConfigApiController) GetPrescriptionTemplateInfo() {
+	id, _ := c.GetInt64("id", 0)
+	template, _ := service.GetHisPrescriptionTemplateByID(id)
+	prescriptions, _ := service.GetHisPrescriptionTemplate(template.ID, c.GetAdminUserInfo().CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template":      template,
+		"prescriptions": prescriptions,
+	})
+}
+
+func (c *HisConfigApiController) CreatePrescriptionTemplate() {
+	id, _ := c.GetInt64("id")
+	name := c.GetString("name")
+	mode_id, _ := c.GetInt64("mode_id", 0)
+	types, _ := c.GetInt64("type", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	types = 1
+	adminInfo := c.GetAdminUserInfo()
+
+	src_template, _ := service.GetHisPrescriptionTemplateByID(id)
+
+	if src_template.ID == 0 {
+		template := models.HisPrescriptionTemplate{
+			UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
+			PatientId: patient_id,
+			Type:      types,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			Name:      name,
+			Mode:      mode_id,
+		}
+		src_template = template
+		service.CreateHisPrescriptionTemplate(&src_template)
+	} else {
+		src_template.Name = name
+		src_template.Mode = mode_id
+		service.SaveHisPrescriptionTemplate(&src_template)
+	}
+
+	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
+	}
+
+	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["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				id := int64(items["id"].(float64))
+
+				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.HisPrescriptionInfoTemplate{
+					ID:          id,
+					PatientId:   patient_id,
+					UserOrgId:   adminInfo.CurrentOrgId,
+					Ctime:       ctime,
+					Mtime:       ctime,
+					Type:        types,
+					Modifier:    adminInfo.AdminUser.Id,
+					Creator:     adminInfo.AdminUser.Id,
+					Status:      1,
+					PTemplateId: src_template.ID,
+				}
+				service.CreateHisPrescriptionInfoTemplate(prescription)
+
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					groupNo := int64(0)
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var s models.HisPrescriptionAdviceTemplate
+							s.PrescriptionId = prescription.ID
+							s.AdviceType = 2
+							s.StopState = 2
+							s.ExecutionState = 2
+							s.Status = 1
+							s.UserOrgId = adminInfo.CurrentOrgId
+							s.Groupno = groupNo
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+							errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateHisPrescriptionAdviceTemplate(&s)
+						}
+					}
+				}
+				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+					projects := items["project"].([]interface{})
+					if len(projects) > 0 {
+						for _, project := range projects {
+							var p models.HisPrescriptionProjectTemplate
+							p.PrescriptionId = prescription.ID
+							p.Ctime = time.Now().Unix()
+							p.Mtime = time.Now().Unix()
+							p.PatientId = patient_id
+							p.UserOrgId = adminInfo.CurrentOrgId
+							p.Status = 1
+							errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateHisPrescriptionProjectTemplate(&p)
+
+						}
+					}
+				}
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "创建成功",
+			})
+		}
+	}
+
+}
+
+func (c *HisConfigApiController) DeletePrescriptionTemplate() {
+	id, _ := c.GetInt64("id")
+	err := service.DelelteHisPrescriptionTemplate(id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+
+func (c *HisConfigApiController) DeletePrescriptionInfoTemplate() {
+
+	prescription_id, _ := c.GetInt64("id")
+	err := service.DelelteHisPrescriptionInfoTemplate(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisConfigApiController) DeleteAdviceTemplate() {
+	id, _ := c.GetInt64("id")
+	err := service.DelelteHisPrescriptionAdviceTemplate(id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+
+func (c *HisConfigApiController) DeleteProjectTemplate() {
+	id, _ := c.GetInt64("id")
+	err := service.DelelteHisPrescriptionProjectTemplate(id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisConfigApiController) setAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate, json map[string]interface{}) int {
+
+	if json["advice_id"] != nil || reflect.TypeOf(json["advice_id"]).String() == "float64" {
+		advice_id := int64(json["advice_id"].(float64))
+		advice.ID = advice_id
+	}
+
+	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["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_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["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["prescribing_number_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["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
+		advice.Price = price
+	}
+	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+		med_list_codg, _ := json["medical_insurance_number"].(string)
+		advice.MedListCodg = med_list_codg
+	}
+	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
+	return 0
+}
+
+func (c *HisConfigApiController) setProjectTemplateWithJSON(project *models.HisPrescriptionProjectTemplate, json map[string]interface{}) int {
+
+	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+		id := int64(json["id"].(float64))
+		project.ID = id
+	}
+
+	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
+		types := int64(json["type"].(float64))
+		project.Type = types
+	}
+	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
+		project_id := int64(json["project_id"].(float64))
+		project.ProjectId = project_id
+	}
+
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		project.Price = price
+	}
+
+	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
+		total, _ := json["total"].(string)
+		totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = totals
+	}
+
+	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
+		medical_code, _ := json["medical_code"].(string)
+		project.MedListCodg = medical_code
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		single_dose, _ := json["single_dose"].(string)
+		project.SingleDose = single_dose
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		delivery_way, _ := json["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		execution_frequency, _ := json["execution_frequency"].(string)
+		project.ExecutionFrequency = execution_frequency
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		project.Remark = remark
+	}
+	if json["number_days"] != nil && reflect.TypeOf(json["number_days"]).String() == "string" {
+		day, _ := json["number_days"].(string)
+		project.Day = day
+	}
+
+	if json["unit"] != nil && reflect.TypeOf(json["unit"]).String() == "string" {
+		unit, _ := json["unit"].(string)
+		project.Unit = unit
+	}
+	return 0
+}

controllers/his_hospital_api_controller.go

@@ -0,0 +1,317 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"fmt"
+	"github.com/astaxie/beego"
+	"time"
+)
+
+type HisHospitalApiController struct {
+	BaseAuthAPIController
+}
+
+func HisHospitalManagerApiRegistRouters() {
+
+	beego.Router("/api/hishospitalpatient/list", &HisHospitalApiController{}, "get:GetHisHospitalPatientList")
+
+	//beego.Router("/api/hishospitalprescription/list", &HisHospitalApiController{}, "get:GetHisHospitalPrescriptionList")
+
+	beego.Router("/api/hospitalcharge/list", &HisHospitalApiController{}, "get:GetHisHospitalChargePatientList")
+	beego.Router("/api/hospotalcharge/info", &HisHospitalApiController{}, "get:GetHisHospitalChargePatientInfo")
+
+	beego.Router("/api/hospitalprescription/list", &HisHospitalApiController{}, "get:GetHisHospitalPrescriptionList")
+	//beego.Router("/api/hishospitalprescription/info", &HisApiController{}, "get:GetHisHospitalPrescriptionInfo")
+
+	//beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
+	//beego.Router("/api/hisprescription/edit", &HisApiController{}, "post:EditHisPrescription")
+
+	//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{}, "get:CreateHisPatientCaseHistory")
+
+	//beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "get:CreateCaseHistoryTemplate")
+	//beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
+
+	//beego.Router("/api/hisorder/list", &HisApiController{}, "get:GetHisOrderList")
+	//beego.Router("/api/hisorder/get", &HisApiController{}, "get:GetHisOrder")
+
+	//beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
+	//
+	//beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
+	//
+	//beego.Router("/api/refund/post", &HisApiController{}, "post:Refund")
+	//
+	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
+	//
+	//beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
+
+	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
+	//新增附加费用
+	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
+	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
+	//beego.Router("/api/hisprescription/get", &HisApiController{}, "Get:GetLastOrNextHisPrescription")
+	//beego.Router("/api/callhisprescription/get", &HisApiController{}, "Get:GetCallHisPrescription")
+	//beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
+	//beego.Router("/api/charge/list", &HisApiController{}, "get:GetHisChargePatientList")
+	//beego.Router("/api/charge/info", &HisApiController{}, "get:GetHisChargePatientInfo")
+	//beego.Router("/api/unregister/list", &HisApiController{}, "get:GetHisUnRegisterPatientList")
+	//beego.Router("/api/orderdetail/get", &HisApiController{}, "get:GetAllOrderDetail")
+	//beego.Router("/api/orderdetaicollect/get", &HisApiController{}, "get:GetAllOrderDetailCollect")
+	//beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
+	//beego.Router("/api/record/list", &HisApiController{}, "get:GetPutOnRecordList")
+	//
+	//beego.Router("/api/comparedata/get", &HisApiController{}, "get:GetCompareData")
+	//beego.Router("/api/fapiao/get", &HisApiController{}, "get:GetFaPiaoData")
+	//
+	//beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
+	//
+	//beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
+
+}
+
+func (c *HisHospitalApiController) GetHisHospitalPatientList() {
+	record_date := c.GetString("record_date")
+	types, _ := c.GetInt64("type", 0)
+
+	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()
+	var patients []*service.HospitalPatient
+	tempPatients, _ := service.GetHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
+
+	for _, item := range tempPatients {
+		if item.HisHospitalCheckRecord.ID > 0 && item.HisHospitalCheckRecord.InHospitalStatus == 1 && item.HisHospitalCheckRecord.OutHospitalStatus == 0 {
+			patients = append(patients, item)
+
+		}
+
+	}
+
+	var total_one int64
+	var total_two int64
+
+	for _, item := range patients {
+
+		if item.VMHisPrescriptionInfo.ID == 0 {
+			total_one = total_one + 1
+		}
+		if item.VMHisPrescriptionInfo.ID > 0 {
+			total_two = total_two + 1
+		}
+	}
+
+	adminUserInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
+	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+
+	if types == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":       patients,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
+		})
+
+	} else if types == 1 { //未就诊
+		var patientsOne []*service.HospitalPatient
+		for _, item := range tempPatients {
+			if item.VMHisPrescriptionInfo.ID == 0 {
+				patientsOne = append(patientsOne, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":       patientsOne,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
+		})
+
+	} else if types == 2 { //已就诊
+		var patientsTwo []*service.HospitalPatient
+		for _, item := range tempPatients {
+
+			if item.VMHisPrescriptionInfo.ID > 0 {
+				patientsTwo = append(patientsTwo, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":       patientsTwo,
+			"total_one":  total_one,
+			"total_two":  total_two,
+			"info":       adminUserInfo,
+			"doctors":    doctors,
+			"department": department,
+		})
+	}
+}
+
+func (c *HisHospitalApiController) GetHisHospitalChargePatientList() {
+	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()
+	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	tempPatients, _ := service.GetNewAllChargeHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
+
+	var patients []*service.HospitalPatient
+	for _, item := range tempPatients {
+		fmt.Println(item.ID)
+		if item.HisHospitalCheckRecord.ID > 0 && item.HisHospitalCheckRecord.InHospitalStatus == 1 &&
+			item.HisHospitalCheckRecord.HisHospitalOrder.ID == 0 {
+			patients = append(patients, item)
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":     patients,
+		"list_two": patients,
+	})
+}
+
+func (c *HisHospitalApiController) GetHisHospitalChargePatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_date := c.GetString("record_date")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	order_status, _ := c.GetInt64("type", 0)
+	p_type, _ := c.GetInt64("p_type", 0)
+
+	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()
+
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetNewHisHospitalPatientInfo(his_patient_id)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	var prescriptions []*models.HisPrescription
+
+	if order_status == 1 || order_status == 0 {
+		prescriptions, _ = service.GetUnChargeHisHospitalPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
+	} else if order_status == 2 {
+		prescriptions, _ = service.GetChargeHisHospitalPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
+	}
+
+	var monthPrescriptions []*models.HisPrescription
+	if order_status == 1 || order_status == 0 {
+		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	} else if order_status == 2 {
+		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	}
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
+	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"prescription":        prescriptions,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
+	})
+	return
+
+}
+
+func (c *HisHospitalApiController) GetHisHospitalrescriptionList() {
+	record_date := c.GetString("record_date")
+	keywords := c.GetString("keywords")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	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()
+	prescriptionOrder, err, total := service.GetHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit)
+
+	//adminInfo := c.GetAdminUserInfo()
+	//prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)
+	//fmt.Println(prescriptionOrder)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": prescriptionOrder,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (c *HisHospitalApiController) GetHisHospitalPrescriptionList() {
+	record_date := c.GetString("record_date")
+	keywords := c.GetString("keywords")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	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()
+	prescriptionOrder, err, total := service.GetHisHospitalPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": prescriptionOrder,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}

controllers/his_project_api_controller.go

@@ -5,9 +5,11 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -24,10 +26,10 @@ func HisProjectRouters() {
 	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/saveprojectteam", &HisProjectApiController{}, "post: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/updateprojectteam", &HisProjectApiController{}, "post: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")
@@ -167,6 +169,7 @@ func (this *HisProjectApiController) SaveProject() {
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
 	if errcode == gorm.ErrRecordNotFound {
 		err = service.CreateHisProject(&hisProject)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 			return
@@ -328,8 +331,17 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
-	ids := this.GetString("ids")
-	item_id := this.GetString("item_id")
+	//ids := this.GetString("ids")
+	//item_id := this.GetString("item_id")
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	projectTeam := models.XtHisProjectTeam{
@@ -343,23 +355,71 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 		UserOrgId:   orgId,
 		Status:      1,
 		CreatedTime: time.Now().Unix(),
-		ProjectId:   ids,
-		ItemId:      item_id,
+		//ProjectId:   ids,
+		//ItemId:      item_id,
 	}
 	//fmt.Println(projectTeam)
 
 	_, errcodes := service.GetHisProjectByNameOne(project_team, orgId)
 
 	if errcodes == gorm.ErrRecordNotFound {
-
 		err := service.CreatedProjectTeam(&projectTeam)
 		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"projectTeam": projectTeam,
-		})
+
+		if dataBody["info"] != nil && reflect.TypeOf(dataBody["info"]).String() == "[]interface {}" {
+			infos, _ := dataBody["info"].([]interface{})
+			if len(infos) > 0 {
+				var ids []string
+
+				for _, item := range infos {
+					items := item.(map[string]interface{})
+					if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+						utils.ErrorLog("id")
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					id := int64(items["id"].(float64))
+
+					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+						utils.ErrorLog("type")
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					types := int64(items["type"].(float64))
+
+					if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+						utils.ErrorLog("number")
+					}
+
+					number, _ := strconv.ParseInt(items["number"].(string), 10, 64)
+
+					list := models.XtHisProjectList{
+						Number:      number,
+						UserOrgId:   adminUserInfo.CurrentOrgId,
+						ProjectId:   id,
+						Status:      1,
+						CreatedTime: time.Now().Unix(),
+						UpdatedTime: time.Now().Unix(),
+						TeamId:      projectTeam.ID,
+						Type:        types,
+					}
+
+					service.CreateProjectList(&list)
+
+					ids = append(ids, strconv.FormatInt(list.ID, 10))
+
+				}
+				ids_str := strings.Join(ids, ",")
+				projectTeam.ItemId = ids_str
+				service.SaveProjectTeam(&projectTeam)
+				this.ServeSuccessJSON(map[string]interface{}{
+					"projectTeam": projectTeam,
+				})
+			}
+		}
 		return
 	} else if errcodes == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
@@ -387,21 +447,23 @@ func (this *HisProjectApiController) GetProjectTeamList() {
 }
 
 func (this *HisProjectApiController) GetProjectTeamDetail() {
-
 	id, _ := this.GetInt64("id")
-	adminUserInfo := this.GetAdminUserInfo()
-	orgId := adminUserInfo.CurrentOrgId
+	//adminUserInfo := this.GetAdminUserInfo()
+	//orgId := adminUserInfo.CurrentOrgId
 	projectTeamDetail, err := service.GetProjectTeamDetail(id)
-	hisList, err := service.GetProjectHisList(orgId)
-	list, err := service.GetAllProjectList(orgId)
+
+	ids := strings.Split(projectTeamDetail.ProjectId, ",")
+	hisList, err := service.GetProjectHisListByIds(ids)
+
+	//list, err := service.GetAllProjectList(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectTeamDetail": projectTeamDetail,
-		"list":              list,
-		"hisList":           hisList,
+		//"list":              list,
+		"hisList": hisList,
 	})
 	return
 }
@@ -417,25 +479,84 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	tube_color, _ := this.GetInt64("tube_color")
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
-	ids := this.GetString("ids")
-	item_id := this.GetString("item_id")
-	projectTeam := models.XtHisProjectTeam{
-		ProjectTeam: project_team,
-		Price:       price_float,
-		Pinyin:      pinyin,
-		Wubi:        wubi,
-		TubeColor:   tube_color,
-		TeamType:    team_type,
-		Remark:      remark,
-		ProjectId:   ids,
-		ItemId:      item_id,
+
+	projectTeam, _ := service.GetProjectTeamDetail(id)
+
+	projectTeam.ProjectTeam = project_team
+	projectTeam.Price = price_float
+	projectTeam.Pinyin = pinyin
+	projectTeam.Wubi = wubi
+	projectTeam.TubeColor = tube_color
+	projectTeam.TeamType = team_type
+	projectTeam.Remark = remark
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
 	}
 
-	err := service.UpdatedProjectTeam(id, &projectTeam)
+	err = service.UpdatedProjectTeam(id, &projectTeam)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+
+	if dataBody["info"] != nil && reflect.TypeOf(dataBody["info"]).String() == "[]interface {}" {
+		infos, _ := dataBody["info"].([]interface{})
+		if len(infos) > 0 {
+			var ids []string
+
+			for _, item := range infos {
+				items := item.(map[string]interface{})
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				types := int64(items["type"].(float64))
+
+				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+					utils.ErrorLog("number")
+				}
+
+				number, _ := strconv.ParseInt(items["number"].(string), 10, 64)
+
+				list := models.XtHisProjectList{
+					Number:      number,
+					UserOrgId:   this.GetAdminUserInfo().CurrentOrgId,
+					ProjectId:   id,
+					Status:      1,
+					CreatedTime: time.Now().Unix(),
+					UpdatedTime: time.Now().Unix(),
+					TeamId:      projectTeam.ID,
+					Type:        types,
+				}
+
+				service.CreateProjectList(&list)
+
+				ids = append(ids, strconv.FormatInt(list.ID, 10))
+
+			}
+			ids_str := strings.Join(ids, ",")
+			projectTeam.ItemId = projectTeam.ItemId + "," + ids_str
+			service.SaveProjectTeam(&projectTeam)
+			this.ServeSuccessJSON(map[string]interface{}{
+				"projectTeam": projectTeam,
+			})
+		}
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectTeam": projectTeam,
 	})
@@ -610,10 +731,12 @@ func (this *HisProjectApiController) GetTreatmentList() {
 }
 
 func (this *HisProjectApiController) GetAllProjectList() {
-
+	keyword := this.GetString("keyword")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	projectList, err := service.GetAllProjectList(orgId)
+	projectList, err := service.GetAllProjectList(orgId, keyword)
+	goodInfos, err := service.GetGoodInfomationList(orgId, keyword)
+
 	//获取列表数据
 	hisprojectlist, err := service.GetHisProjectListByOrgId(orgId)
 
@@ -624,6 +747,7 @@ func (this *HisProjectApiController) GetAllProjectList() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectList":    projectList,
 		"hisprojectlist": hisprojectlist,
+		"good_info":      goodInfos,
 	})
 	return
 }
@@ -689,12 +813,15 @@ func (this *HisProjectApiController) GetHisProject() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	project, err := service.GetHisProject(orgId)
+	good_info, err := service.GetGoodInfoMation(orgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"project": project,
+		"project":   project,
+		"good_info": good_info,
 	})
 }
 
@@ -805,55 +932,65 @@ func (this *HisProjectApiController) SaveHisPatient() {
 		return
 	}
 
-	timeStr := time.Now().Format("2006-01-02")
-	timeArr := strings.Split(timeStr, "-")
-	var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
-
-	his, err := service.GetHisPatientInfo(adminUserInfo.CurrentOrgId, patient.ID, recordDate.Unix())
-
+	timeStr := time.Now().Format("2006-01-02 15:04:05")
+	fmt.Println(timeStr)
+	timeArr := strings.Split(timeStr, " ")
+	timeArrTwo := strings.Split(timeArr[0], "-")
+	timeArrThree := strings.Split(timeArr[1], ":")
+	var str = timeArrTwo[0] + timeArrTwo[1] + timeArrTwo[2] + timeArrThree[0] + timeArrThree[1] + timeArrThree[2] + strconv.FormatInt(patient.ID, 10)
+
+	//his, _ := service.GetHisPatientInfoTwo(adminUserInfo.CurrentOrgId, patient.ID, recordDate.Unix())
+	//if len(his) >= 1 {
+	//	order, _ := service.GetNewHisOrderTwo(adminUserInfo.CurrentOrgId, his[len(his)-1].Number, his[len(his)-1].PatientId, recordDate.Unix())
+	//	if len(his) >= 1 && order.ID == 0 {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientParamWrong)
+	//		return
+	//	}
+	//}
 	var hisPatient models.XtHisPatient
-	if err == gorm.ErrRecordNotFound || his.ID == 0 {
-		hisPatient = models.XtHisPatient{
-			PatientId:              patient_id,
-			Birthday:               birthUnix,
-			IdType:                 certificates,
-			CostOfProduction:       cost_float,
-			Departments:            department,
-			Doctor:                 doctor,
-			AdminUserId:            adminUserInfo.AdminUser.Id,
-			MedicalTreatmentType:   medicalcare,
-			IdCardNo:               idcard,
-			IsNeedCostOfProduction: cost_checked,
-			TreatmentCost:          medicalExpense_float,
-			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			Age:                 age,
-			Number:              str,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			Status:              1,
-			RecordDate:          nowtime,
-			IsReturn:            1,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
-			IdCardType:          id_card_type,
-			Diagnosis:           diagnosis_id,
-			PType:               reg_type,
-			SickType:            sick_type,
-		}
-		service.CreateHisPatient(&hisPatient)
-		this.ServeSuccessJSON(map[string]interface{}{
-			"his_info": hisPatient,
-		})
-	} else {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
-		return
-	}
+	//if err == gorm.ErrRecordNotFound || his.ID == 0 {
+	hisPatient = models.XtHisPatient{
+		PatientId:              patient_id,
+		Birthday:               birthUnix,
+		IdType:                 certificates,
+		CostOfProduction:       cost_float,
+		Departments:            department,
+		Doctor:                 doctor,
+		AdminUserId:            adminUserInfo.AdminUser.Id,
+		MedicalTreatmentType:   medicalcare,
+		IdCardNo:               idcard,
+		IsNeedCostOfProduction: cost_checked,
+		TreatmentCost:          medicalExpense_float,
+		MedicalInsuranceNumber: medicalinsurancecard,
+		Name:                   name,
+		Age:                    age,
+		Number:                 str,
+		RegisterType:           register,
+		RegisterCost:           registrationfees_float,
+		BalanceAccountsType:    settlementValue,
+		Gender:                 sex,
+		Total:                  totals_float,
+		UserOrgId:              orgId,
+		Status:                 1,
+		RecordDate:             nowtime,
+		IsReturn:               1,
+		Ctime:                  time.Now().Unix(),
+		Phone:                  phone,
+		SocialType:             social_type,
+		IdCardType:             id_card_type,
+		Diagnosis:              diagnosis_id,
+		PType:                  reg_type,
+		SickType:               sick_type,
+	}
+	service.CreateHisPatient(&hisPatient)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"his_info": hisPatient,
+	})
+	//}
+	//else {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
+	//	return
+	//}
 
 }
 
@@ -1051,7 +1188,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	//prescription_id, _ := this.GetInt64("prescription_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId)
-	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
+	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId, "")
 	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	hisPatient, _ := service.GetHisPatientById(patient_id)
 	if err != nil {
@@ -1394,13 +1531,15 @@ func (this *HisProjectApiController) GetAllDepartmentList() {
 func (this *HisProjectApiController) GetPrescription() {
 
 	patient_id, _ := this.GetInt64("patient_id")
+	p_type, _ := this.GetInt64("p_type")
+
 	fmt.Println("patient_id", 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()
-	list, err := service.GetPrescriptionByPatientId(patient_id, timenow)
+	list, err := service.GetPrescriptionByPatientId(patient_id, timenow, p_type)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/manager_center_api_controller.go

@@ -141,8 +141,9 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	min_price, _ := c.GetFloat("min_price")
 	min_number, _ := c.GetInt64("min_number")
 	drug_day := c.GetString("drug_day")
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()
-
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
 		Pinyin:                      pinyin,
@@ -202,6 +203,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Dose:                        dose,
 		MinPrice:                    min_price,
 		DoseUnit:                    dose_unit,
+		HospApprFlag:                hosp_appr_flag,
+		LmtUsedFlag:                 lmt_used_flag,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -292,9 +295,10 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	dose_unit := c.GetString("dose_unit")
 	fmt.Println("单位999999999999999999999999999999", dose_unit)
 	min_price, _ := c.GetFloat("min_price")
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
-
 	drugLib := &models.BaseDrugLib{
 		ID:                          id,
 		DrugName:                    drug_name,
@@ -352,6 +356,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
 		DrugDay:                     drug_day,
+		HospApprFlag:                hosp_appr_flag,
+		LmtUsedFlag:                 lmt_used_flag,
 		MinNumber:                   min_number,
 		Dose:                        dose,
 		MinPrice:                    min_price,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -375,6 +375,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
 
+	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
+
+	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+
 	stockType, _ := service.GetStockType(adminInfo.Org.Id)
 
 	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
@@ -439,6 +443,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"prepare":                        prepare,
 		"lastAssessment":                 lastAssessment,
 		"prescribeOne":                   prescribeOne,
+		"is_project_open_config":         is_project_open_config,
+		"project":                        projects,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -4288,14 +4294,16 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
 	goodTypes, _ := service.FindAllGoodTypeOne(adminUser.Org.Id)
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
 
 	goodUser, _ := service.GetAllStockOutUserDetail(patient_id, adminUser.Org.Id, date.Unix())
 	lastGoodUserDetial, _ := service.GetLastDialysisGoods(patient_id, adminUser.Org.Id, date.Unix())
 
-	//获取今日患者的透析处方参数
+	project, _ := service.GetHisPrescriptionProject(adminUser.Org.Id, patient_id, date.Unix())
 
+	//获取今日患者的透析处方参数
 	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -4303,6 +4311,7 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 		"good_user":      goodUser,
 		"good_info":      good_info,
 		"last_good_user": lastGoodUserDetial,
+		"project":        project,
 		"prescription":   prescribe,
 	})
 	return

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -48,6 +48,11 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/advice/exec", &PatientApiController{}, "Post:ExecDoctorAdvice")
 	beego.Router("/m/api/advice/exec/modify", &PatientApiController{}, "Post:ModifyExecDoctorAdvice")
 
+	beego.Router("/m/api/project/exec", &PatientApiController{}, "Post:ExecProject")
+	beego.Router("/m/api/project/check", &PatientApiController{}, "Post:CheckProject")
+
+	//beego.Router("/m/api/advice/ex/**/ec/modify", &PatientApiController{}, "Post:ModifyExecDoctorAdvice")
+
 	beego.Router("/m/api/advice/check", &PatientApiController{}, "Post:CheckDoctorAdvice")
 	beego.Router("/m/api/patient/info", &PatientApiController{}, "Get:GetPatientInfoWithDiseases")
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2947,6 +2947,34 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	//临时医嘱
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
+	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
+
+	project_config, _ := service.GetHisProjectConfig(adminUserInfo.Org.Id)
+	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
+		for _, item := range projects {
+			var advice *models.HisDoctorAdviceInfo
+			advice.ID = item.ID
+			advice.Checker = item.Checker
+			advice.CheckTime = item.CheckTime
+			advice.CheckState = item.CheckState
+			advice.ExecutionState = item.ExecutionState
+			advice.ExecutionStaff = item.ExecutionStaff
+			advice.PrescribingNumber = float64(item.Count)
+			advice.PrescribingNumberUnit = item.Unit
+			advice.AdviceDoctor = item.Doctor
+			if item.Type == 3 {
+				advice.AdviceName = item.GoodInfo.GoodName
+			} else if item.Type == 2 {
+				advice.AdviceName = item.HisProject.ProjectName
+			}
+			advice.StartTime = item.StartTime
+			hisAdvice = append(hisAdvice, advice)
+		}
+
+	}
+
 	if len(DoctorAdvice) > 0 {
 		for _, item := range DoctorAdvice {
 			if item.AdviceDoctor > 0 {
@@ -2961,6 +2989,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		}
 	}
 
+	//DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+
 	//透析监测
 	Record, _ := service.FindAllMonitorRecord(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	//透析小结
@@ -2977,8 +3007,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
 
-	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
-	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,
@@ -3565,3 +3593,82 @@ func (this *PatientApiController) GetSearchPatient() {
 		"patient": patient,
 	})
 }
+
+func (c *PatientApiController) ExecProject() {
+	execution_time := c.GetString("execution_time")
+	project_id, _ := c.GetInt64("project_id")
+
+	if len(execution_time) <= 0 {
+		utils.ErrorLog("execution_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theTime, errs := time.ParseInLocation(timeLayout2, execution_time, loc)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := c.GetMobileAdminUserInfo()
+	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+	if project.ExecutionState == 1 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
+		return
+	}
+	if project.Checker >= 0 && project.Checker == adminInfo.AdminUser.Id {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+		return
+	}
+
+	project.ExecutionState = 1
+	project.ExecutionStaff = adminInfo.AdminUser.Id
+	project.ExecutionTime = theTime.Unix()
+	err := service.SaveHisProject(&project)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"project": project,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}
+
+func (c *PatientApiController) CheckProject() {
+
+	adminInfo := c.GetMobileAdminUserInfo()
+	project_id, _ := c.GetInt64("project_id")
+	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+
+	if project.CheckState == 1 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
+		return
+	}
+	if project.ExecutionStaff >= 0 && project.ExecutionStaff == adminInfo.AdminUser.Id {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+		return
+	}
+
+	project.Checker = adminInfo.AdminUser.Id
+	project.CheckTime = time.Now().Unix()
+	project.CheckState = 1
+
+	err := service.SaveHisProject(&project)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":     "ok",
+			"project": project,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -19,6 +19,7 @@ type MobileHisApiController struct {
 
 func (c *MobileHisApiController) GetHisPrescriptionConfig() {
 	adminInfo := c.GetMobileAdminUserInfo()
+
 	//获取医嘱模版
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.Org.Id)
 	//获取所有基础药
@@ -28,6 +29,7 @@ func (c *MobileHisApiController) GetHisPrescriptionConfig() {
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.Org.Id)
 	team, _ := service.GetAllProjectTeamList(adminInfo.Org.Id)
 	projects, _ := service.GetHisProject(adminInfo.Org.Id)
+	good_info, _ := service.GetGoodInfoMation(adminInfo.Org.Id)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(adminInfo.Org.Id)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -39,6 +41,7 @@ func (c *MobileHisApiController) GetHisPrescriptionConfig() {
 		"department":       department,
 		"projects":         projects,
 		"team":             team,
+		"good_info":        good_info,
 	})
 }
 func (c *MobileHisApiController) GetHisPatientInfo() {
@@ -68,22 +71,30 @@ func (c *MobileHisApiController) GetHisPatientInfo() {
 	}
 	endRecordDateTime := endTime.Unix()
 
+	var last_prescriptions []*models.HisPrescription
+	var sch_prescriptions []*models.HisPrescriptionInfoTemplate
+
 	admin := c.GetMobileAdminUserInfo()
 	his_patient_info, _ := service.GetHisPatientInfo(admin.Org.Id, patient_id, recordDateTime)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.Org.Id, patient_id)
-	prescriptions, _ := service.GetHisPrescription(admin.Org.Id, patient_id, recordDateTime)
-	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.Org.Id, patient_id, startRecordDateTime, endRecordDateTime)
+	prescriptions, _ := service.GetHisPrescription(admin.Org.Id, patient_id, recordDateTime, 2)
+	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.Org.Id, patient_id, startRecordDateTime, endRecordDateTime, 2)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.Org.Id, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime, 2)
 	order, _ := service.GetHisOrder(admin.Org.Id, number, patient_id)
-	all_prescriptions, _ := service.GetCallHisPrescriptions(startRecordDateTime, endRecordDateTime, admin.Org.Id, patient_id)
-
+	all_prescriptions, _ := service.GetCallHisPrescriptions(startRecordDateTime, endRecordDateTime, admin.Org.Id, patient_id, 2)
 	adminUserInfo, _ := service.GetAdminUserInfoByID(admin.Org.Id, admin.AdminUser.Id)
-
 	doctors, _ := service.GetHisAdminUserDoctors(admin.Org.Id)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.Org.Id)
-
+	last_p_info, _ := service.FindLastPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime)
+	last_prescriptions, _ = service.GetHisPrescription(admin.Org.Id, patient_id, last_p_info.RecordDate, 2)
+	sch, _ := service.GetPatientSch(patient_id, recordDateTime, admin.Org.Id)
+	if sch.ID > 0 {
+		mode_template, _ := service.GetHisPrescriptionBySchMode(sch.ModeId, patient_id, admin.Org.Id)
+		sch_prescriptions, _ = service.GetHisPrescriptionTemplate(mode_template.ID, admin.Org.Id)
+	}
+	count, _ := service.GetHisPatientCount(admin.Org.Id, patient_id, recordDateTime)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":            his_patient_info,
 		"xt_info":             xt_patient_info,
@@ -96,6 +107,10 @@ func (c *MobileHisApiController) GetHisPatientInfo() {
 		"department":          department,
 		"admin_user_info":     adminUserInfo,
 		"all_prescriptions":   all_prescriptions,
+		"sch_prescriptions":   sch_prescriptions,
+		"last_prescriptions":  last_prescriptions,
+		"schedule":            sch,
+		"count":               count,
 	})
 	return
 
@@ -109,7 +124,7 @@ func (this *MobileHisApiController) GetCallHisPrescription() {
 	end_time := this.GetString("end_time")
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.Org.Id, patient_id)
+	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.Org.Id, patient_id, 2)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"prescriptions": prescriptions,
@@ -122,8 +137,38 @@ func (this *MobileHisApiController) GetCallHisPrescription() {
 }
 func (c *MobileHisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
+	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
+	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
+
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		if len(projects) > 0 {
+			for _, item := range projects {
+				if item.Type == 3 { //处理透前准备耗材数量数据
+					consumables, _ := service.FindHisConsumablesByID(item.UserOrgId, item.PatientId, item.RecordDate, item.ProjectId)
+					if consumables.ID > 0 {
+						consumables.Count = 0
+						service.UpdateConsumables(&consumables)
+					}
+				}
+			}
+		}
+		if len(advices) > 0 {
+			for _, item := range advices {
+				drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, item.DrugId)
+				if item.PrescribingNumberUnit == drug.MinUnit {
+					drug.Total = drug.Total + item.PrescribingNumber
+					service.UpdateBaseDrugLib(&drug)
+				} else {
+					if item.PrescribingNumberUnit == drug.MaxUnit {
+						item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
+						drug.Total = drug.Total + item.PrescribingNumber
+						service.UpdateBaseDrugLib(&drug)
+					}
+				}
+			}
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -135,9 +180,20 @@ func (c *MobileHisApiController) DeletePrescription() {
 }
 func (c *MobileHisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
-	//TODO 需要判断是否已经结算
+	advice, _ := service.GetHisDoctorAdvicesById(id)
 	err := service.DelelteDoctorAdvice(id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, advice.DrugId)
+		if advice.PrescribingNumberUnit == drug.MinUnit {
+			drug.Total = drug.Total + advice.PrescribingNumber
+			service.UpdateBaseDrugLib(&drug)
+		} else {
+			if advice.PrescribingNumberUnit == drug.MaxUnit {
+				advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
+				drug.Total = drug.Total + advice.PrescribingNumber
+				service.UpdateBaseDrugLib(&drug)
+			}
+		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -149,9 +205,18 @@ func (c *MobileHisApiController) DeleteDoctorAdvice() {
 }
 func (c *MobileHisApiController) DeleteProject() {
 	id, _ := c.GetInt64("id")
-	//TODO 需要判断是否已经结算
+	project, _ := service.GetHisProjectByID(id)
+	adminInfo := c.GetMobileAdminUserInfo()
+	var consumable models.DialysisBeforePrepare
+	if project.ID > 0 && project.Type == 3 {
+		consumable, _ = service.FindHisConsumablesByID(adminInfo.Org.Id, project.PatientId, project.RecordDate, project.ProjectId)
+	}
 	err := service.DelelteProject(id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		if consumable.ID > 0 {
+			consumable.Count = 0
+			service.UpdateConsumables(&consumable)
+		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -191,7 +256,63 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 	role, _ := service.GetAdminUserInfoByID(adminInfo.Org.Id, doctor_id)
 
-	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime)
+	//校验库存总量
+
+	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["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var drug_id int64
+							var prescribing_number float64
+							var prescribingNumberUnit string
+
+							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+							}
+							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "float64" {
+								//presc ribing_number = advice.(map[string]interface{})["prescribing_number"].(float64)
+								prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+								prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+
+							}
+
+							if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+								prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+							}
+
+							drug, _ := service.FindBaseDrugLibRecord(adminInfo.Org.Id, drug_id)
+							if drug.ID == 0 {
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+								return
+							}
+
+							if prescribingNumberUnit == drug.MinUnit {
+								if prescribing_number > drug.Total {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+									return
+								}
+							} else {
+								if prescribingNumberUnit == drug.MaxUnit {
+									num := prescribing_number * float64(drug.MinNumber)
+									if num > drug.Total {
+										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										return
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime, 2)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
 		var randNum int
@@ -219,6 +340,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 			Doctor:             role.UserName,
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
+			PType:              2,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 
@@ -242,12 +364,14 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 			PrescriptionStatus: info.PrescriptionStatus,
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
+			PType:              info.PType,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 	}
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+		var tempPrescription *models.HisPrescription
 
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
@@ -259,6 +383,9 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				}
 				id := int64(items["id"].(float64))
 
+				new_prescription, _ := service.GetPrescriptionById(id, adminInfo.Org.Id)
+				tempPrescription = &new_prescription
+
 				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
 					utils.ErrorLog("type")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -266,6 +393,15 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				}
 				types := int64(items["type"].(float64))
 
+				if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
+					utils.ErrorLog("order_status")
+				}
+				order_status := int64(items["order_status"].(float64))
+
+				if order_status == 0 {
+					order_status = 1
+				}
+
 				if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
 					utils.ErrorLog("pre_time")
 				}
@@ -283,25 +419,38 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				fmt.Println(pTime)
 
 				ctime := time.Now().Unix()
-				prescription := &models.HisPrescription{
-					ID:                 id,
-					PatientId:          patient_id,
-					UserOrgId:          adminInfo.Org.Id,
-					RecordDate:         recordDateTime,
-					Ctime:              ctime,
-					Mtime:              ctime,
-					Type:               types,
-					Modifier:           adminInfo.AdminUser.Id,
-					Creator:            adminInfo.AdminUser.Id,
-					Status:             1,
-					Doctor:             role.UserName,
-					HisPatientId:       his_patient_id,
-					OrderStatus:        1,
-					BatchNumber:        "",
-					PrescriptionNumber: hpInfo.PrescriptionNumber,
-					PreTime:            pTime,
+				if tempPrescription.ID == 0 {
+					prescription := &models.HisPrescription{
+						ID:                 id,
+						PatientId:          patient_id,
+						UserOrgId:          adminInfo.Org.Id,
+						RecordDate:         recordDateTime,
+						Ctime:              ctime,
+						Mtime:              ctime,
+						Type:               types,
+						Modifier:           adminInfo.AdminUser.Id,
+						Creator:            adminInfo.AdminUser.Id,
+						Status:             1,
+						Doctor:             role.UserName,
+						HisPatientId:       his_patient_id,
+						OrderStatus:        order_status,
+						BatchNumber:        "",
+						PrescriptionNumber: hpInfo.PrescriptionNumber,
+						PreTime:            pTime,
+						PType:              2,
+					}
+					tempPrescription = prescription
+				} else {
+					tempPrescription.Type = types
+					tempPrescription.Modifier = adminInfo.AdminUser.Id
+					tempPrescription.Mtime = time.Now().Unix()
+					tempPrescription.Doctor = role.UserName
+					tempPrescription.OrderStatus = order_status
+					tempPrescription.PreTime = pTime
+					tempPrescription.PType = 2
+
 				}
-				service.SaveHisPrescription(prescription)
+				service.SaveHisPrescription(tempPrescription)
 
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.Org.Id)
@@ -315,7 +464,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					if len(advices) > 0 {
 						for _, advice := range advices {
 							var s models.HisDoctorAdviceInfo
-							s.PrescriptionId = prescription.ID
+							s.PrescriptionId = tempPrescription.ID
 							s.AdviceType = 2
 							s.AdviceDoctor = doctor_id
 							s.StopState = 2
@@ -352,7 +501,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					if len(projects) > 0 {
 						for _, project := range projects {
 							var p models.HisPrescriptionProject
-							p.PrescriptionId = prescription.ID
+							p.PrescriptionId = tempPrescription.ID
 							p.Ctime = time.Now().Unix()
 							p.Mtime = time.Now().Unix()
 							p.PatientId = patient_id
@@ -360,6 +509,8 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							p.UserOrgId = adminInfo.Org.Id
 							p.HisPatientId = his_patient_id
 							p.Status = 1
+							p.Doctor = doctor_id
+							p.StartTime = pTime
 							errcode := c.setProjectWithJSON(&p, project.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -374,6 +525,14 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
 							service.SaveHisProjectTwo(&p)
 
+							if p.Type == 3 { //处理透前准备耗材数量数据
+								consumables, _ := service.FindHisConsumablesByID(adminInfo.Org.Id, patient_id, recordDateTime, p.ProjectId)
+								if consumables.ID > 0 {
+									consumables.Count = p.Count
+									service.UpdateConsumables(&consumables)
+								}
+							}
+
 						}
 					}
 				}
@@ -402,7 +561,7 @@ func (this *MobileHisApiController) GetLastOrNextHisPrescription() {
 	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
 	record_time := theAdviceRecordTime.Unix()
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.Org.Id, patient_id)
+	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.Org.Id, patient_id, 2)
 	if err == nil {
 		if len(prescriptions) == 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
@@ -468,6 +627,88 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		}
 	}
 
+	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["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
+		advice.PrescribingNumberUnit = prescribingNumberUnit
+	}
+
+	drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	if advice.ID == 0 { //医嘱不存在
+		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据单位与基础库一致为最小单位，直接计算
+			drug.Total = drug.Total - advice.PrescribingNumber
+			service.UpdateBaseDrugLib(&drug)
+
+		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据单位为最大单位，需要将最大单位转为最小单位
+			num := advice.PrescribingNumber * float64(drug.MinNumber)
+			drug.Total = drug.Total - num
+			service.UpdateBaseDrugLib(&drug)
+		}
+
+	} else if advice.ID > 0 { //医嘱存在
+		hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
+		var num float64
+
+		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据为最小单位
+			if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最小单位，三个单位一致为最小单位直接计算
+				if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
+					num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
+					drug.Total = drug.Total + num
+					service.UpdateBaseDrugLib(&drug)
+				} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
+					num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
+					drug.Total = drug.Total - num
+					service.UpdateBaseDrugLib(&drug)
+				}
+			} else { //原数据为最大单位，需要将最大单位数量转为最小单位数量
+				num2 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+				if num2 > advice.PrescribingNumber {
+					num = num2 - advice.PrescribingNumber
+					drug.Total = drug.Total + num
+					service.UpdateBaseDrugLib(&drug)
+				} else if num2 < advice.PrescribingNumber {
+					num = advice.PrescribingNumber - num2
+					drug.Total = drug.Total - num
+					service.UpdateBaseDrugLib(&drug)
+				}
+
+			}
+
+		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据为最大单位
+			if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最大单位， 当前数据单位和原数据单位都为最大单位，需要将两个数据转成最小单位
+				num1 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+				if num1 > num2 {
+					num = num1 - num2
+					drug.Total = drug.Total + num
+					service.UpdateBaseDrugLib(&drug)
+				} else if num1 < num2 {
+					num = num2 - num1
+					drug.Total = drug.Total - num
+					service.UpdateBaseDrugLib(&drug)
+				}
+
+			} else { //原数据为最小单位，当前数据为最大单位，需要将当前数据数量转为最小单位数量
+				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+				//num2 := hisAdvice.PrescribingNumber * (drug.Dose / float64(drug.MinNumber))
+				if hisAdvice.PrescribingNumber > num2 {
+					num = hisAdvice.PrescribingNumber - num2
+					drug.Total = drug.Total + num
+					service.UpdateBaseDrugLib(&drug)
+				} else if num2 < advice.PrescribingNumber {
+					num = num2 - hisAdvice.PrescribingNumber
+					drug.Total = drug.Total - num
+					service.UpdateBaseDrugLib(&drug)
+				}
+
+			}
+		}
+	}
+
 	//
 	//if json["execution_time"] != nil && reflect.TypeOf(json["execution_time"]).String() == "string" {
 	//	execution_time, _ := strconv.ParseInt(json["execution_time"].(string), 10,64)
@@ -523,14 +764,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		singleDoseUnit, _ := json["single_dose_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["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
-		prescribingNumberUnit, _ := json["prescribing_number_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
@@ -555,10 +789,28 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 	return 0
 }
 func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescriptionProject, json map[string]interface{}) int {
+	project.ExecutionStaff = 0
+	project.ExecutionState = 2
+	project.ExecutionTime = 0
+	project.Checker = 0
+	project.CheckState = 2
+	project.CheckTime = 0
 	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
 		id := int64(json["id"].(float64))
 		project.ID = id
+		temp_project, _ := service.GetHisPrescriptionProjectByID(id)
+		project.ExecutionStaff = temp_project.ExecutionStaff
+		project.ExecutionState = temp_project.ExecutionState
+		project.ExecutionTime = temp_project.ExecutionTime
+		project.Checker = temp_project.Checker
+		project.CheckState = temp_project.CheckState
+		project.CheckTime = temp_project.CheckTime
 	}
+	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
+		types := int64(json["type"].(float64))
+		project.Type = types
+	}
+
 	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
 		project_id := int64(json["project_id"].(float64))
 		project.ProjectId = project_id

controllers/patient_api_controller.go

@@ -1654,6 +1654,203 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		fmt.Println("9999999999999999999999999", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
+			//advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
+			//for _, item := range advices {
+			//
+			//	//调用药品出库接口
+			//	//service.DrugsDelivery(item.UserOrgId, item)
+			//
+			//	//if item.Way == 1 {
+			//	//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
+			//	//	if err == gorm.ErrRecordNotFound {
+			//	//		//没有记录，则创建出库单
+			//	//		timeStr := time.Now().Format("2006-01-02")
+			//	//		timeArr := strings.Split(timeStr, "-")
+			//	//		total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
+			//	//		total = total + 1
+			//	//		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			//	//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			//	//		number = number + total
+			//	//		warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+			//	//		creater := adminUserInfo.AdminUser.Id
+			//	//		warehouseOut := models.DrugWarehouseOut{
+			//	//			WarehouseOutOrderNumber: warehousing_out_order,
+			//	//			OperationTime:           time.Now().Unix(),
+			//	//			OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//			Creater:                 creater,
+			//	//			Ctime:                   time.Now().Unix(),
+			//	//			Status:                  1,
+			//	//			WarehouseOutTime:        item.RecordDate,
+			//	//			Dealer:                  0,
+			//	//			Manufacturer:            0,
+			//	//			Type:                    1,
+			//	//			IsSys:                   1,
+			//	//		}
+			//	//
+			//	//		err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+			//	//		if err != nil {
+			//	//			utils.TraceLog("创建出库单失败 err = %v", err)
+			//	//		} else {
+			//	//			if item.Way == 1 {
+			//	//				if item.PrescribingNumber > 0 {
+			//	//					warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			//	//						WarehouseOutId:          warehouseOut.ID,
+			//	//						Status:                  1,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Remark:                  "",
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						Type:                    1,
+			//	//						Manufacturer:            0,
+			//	//						Dealer:                  0,
+			//	//						IsSys:                   1,
+			//	//						SysRecordTime:           item.RecordDate,
+			//	//						DrugId:                  item.DrugId,
+			//	//					}
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					warehouseOutInfo.Count = count
+			//	//					stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//					warehouseOutInfo.Price = stockInInfo.Price
+			//	//					err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//					if err == nil {
+			//	//						details := &models.DrugAutomaticReduceDetail{
+			//	//							WarehouseOutId:          warehouseOutInfo.ID,
+			//	//							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//							PatientId:               item.PatientId,
+			//	//							Ctime:                   time.Now().Unix(),
+			//	//							Mtime:                   time.Now().Unix(),
+			//	//							Status:                  1,
+			//	//							RecordTime:              item.RecordDate,
+			//	//							OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//							DrugId:                  item.DrugId,
+			//	//							Count:                   count,
+			//	//						}
+			//	//						service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//						if err != nil {
+			//	//							utils.TraceLog("创建出库单失败 err = %v", err)
+			//	//						} else {
+			//	//							if item.Way == 1 {
+			//	//								if item.PrescribingNumber > 0 {
+			//	//									warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			//	//										WarehouseOutId:          warehouseOut.ID,
+			//	//										Status:                  1,
+			//	//										Ctime:                   time.Now().Unix(),
+			//	//										Remark:                  "",
+			//	//										OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//										Type:                    1,
+			//	//										Manufacturer:            0,
+			//	//										Dealer:                  0,
+			//	//										IsSys:                   1,
+			//	//										SysRecordTime:           item.RecordDate,
+			//	//										DrugId:                  item.DrugId,
+			//	//									}
+			//	//									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//									warehouseOutInfo.Count = count
+			//	//									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//									warehouseOutInfo.Price = stockInInfo.Price
+			//	//									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//									if err == nil {
+			//	//										details := &models.DrugAutomaticReduceDetail{
+			//	//											WarehouseOutId:          warehouseOutInfo.ID,
+			//	//											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//											PatientId:               item.PatientId,
+			//	//											Ctime:                   time.Now().Unix(),
+			//	//											Mtime:                   time.Now().Unix(),
+			//	//											Status:                  1,
+			//	//											RecordTime:              item.RecordDate,
+			//	//											OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//											DrugId:                  item.DrugId,
+			//	//											Count:                   count,
+			//	//										}
+			//	//										service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//									}
+			//	//								}
+			//	//							}
+			//	//						}
+			//	//
+			//	//					}
+			//	//				}
+			//	//			}
+			//	//		}
+			//	//	} else if err == nil {
+			//	//		if item.Way == 1 {
+			//	//			outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+			//	//			if err == gorm.ErrRecordNotFound {
+			//	//				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//					WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+			//	//					WarehouseOutId:          out.ID,
+			//	//					Status:                  1,
+			//	//					Ctime:                   time.Now().Unix(),
+			//	//					Remark:                  "",
+			//	//					OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//					Type:                    1,
+			//	//					Manufacturer:            0,
+			//	//					Dealer:                  0,
+			//	//					IsSys:                   1,
+			//	//					SysRecordTime:           item.RecordDate,
+			//	//				}
+			//	//
+			//	//				stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//				warehouseOutInfo.Price = stockInInfo.Price
+			//	//				warehouseOutInfo.DrugId = item.DrugId
+			//	//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//				warehouseOutInfo.Count = count
+			//	//				err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//				if err == nil {
+			//	//					details := &models.DrugAutomaticReduceDetail{
+			//	//						WarehouseOutId:          warehouseOutInfo.ID,
+			//	//						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//						PatientId:               item.PatientId,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Mtime:                   time.Now().Unix(),
+			//	//						Status:                  1,
+			//	//						RecordTime:              item.RecordDate,
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						DrugId:                  item.DrugId,
+			//	//						Count:                   count,
+			//	//					}
+			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//				}
+			//	//
+			//	//			} else if err == nil { //记录存在，则将增加数量
+			//	//				if outInfo.ID > 0 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
+			//	//				}
+			//	//
+			//	//				count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
+			//	//				if count == 0 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					details := &models.DrugAutomaticReduceDetail{
+			//	//						WarehouseOutId:          outInfo.ID,
+			//	//						WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+			//	//						PatientId:               item.PatientId,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Mtime:                   time.Now().Unix(),
+			//	//						Status:                  1,
+			//	//						RecordTime:              item.RecordDate,
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						DrugId:                  item.DrugId,
+			//	//						Count:                   count,
+			//	//					}
+			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//				} else if count == 1 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
+			//	//				}
+			//	//
+			//	//			}
+			//	//		}
+			//	//	}
+			//	//}
+			//}
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 				fmt.Println("imte00000000000000", item.PrescribingNumber)

controllers/public_api_controller.go

@@ -32,6 +32,8 @@ func PublicApiRegistRouters() {
 
 	beego.Router("/handel", &PublicApiController{}, "get:HandleHIS")
 
+	//beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
+
 }
 
 func (c *PublicApiController) GetDoctorAdviceConfig() {
@@ -1647,3 +1649,33 @@ func (c *PublicApiController) HandleHIS() {
 	}
 
 }
+
+//func (c *PublicApiController)HandleOrder(){
+//	//orders, _ := service.GetAllHisOrder()
+//
+//
+//	order, _ := service.GetLastHisOrder()
+//
+//	fpNumber, _ := strconv.Atoi(order.FaPiaoNumber)
+//
+//
+//	//fmt.Println(fpNumber)
+//
+//	//for index, item := range orders {
+//	//	item.FaPiaoCode ="144072080589"
+//	//	var zero string
+//	//	if 1520 + int64(index) >= 1000{
+//	//		zero = "0000" + strconv.FormatInt(1520 + int64(index),10)
+//	//	}else if 1520 + int64(index) >= 10000{
+//	//		zero = "000" + strconv.FormatInt(1520 + int64(index),10)
+//	//	} else if 1520 + int64(index) >= 100000{
+//	//		zero = "00" +strconv.FormatInt(1520 + int64(index),10)
+//	//	} else if 1520 + int64(index) >= 1000000{
+//	//		zero = "0" +strconv.FormatInt(1520 + int64(index),10)
+//	//	}else {
+//	//		zero = strconv.FormatInt(1520 + int64(index),10)
+//	//	}
+//	//	item.FaPiaoNumber = zero
+//	//	service.SaveOrder(item)
+//	//}
+//}

controllers/role_controller.go

@@ -238,6 +238,8 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 	_, _, outpatientRegistrationPurviewThree := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientCharges")
 
+	_, _, outpatientRegistrationPurviewFour := service.GetOtherAllGeneralPurviewVMsProcessed("/hospitalStation")
+
 	//透析管理
 	_, _, originDialysisWatchPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/watch")
 	_, _, originWorkforcePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/workforce/patient")
@@ -263,6 +265,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 	subPurviewTreeViewModelTwo := []*service.PurviewTreeViewModel{}
 	subPurviewTreeViewModelThree := []*service.PurviewTreeViewModel{}
+	subPurviewTreeViewModelFour := []*service.PurviewTreeViewModel{}
 
 	for _, item := range outpatientRegistrationPurview {
 		temp := &service.PurviewTreeViewModel{
@@ -294,6 +297,16 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		subPurviewTreeViewModelThree = append(subPurviewTreeViewModelThree, temp)
 	}
 
+	for _, item := range outpatientRegistrationPurviewFour {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subPurviewTreeViewModelFour = append(subPurviewTreeViewModelFour, temp)
+	}
+
 	for _, item := range outpatientRegistration {
 		if item.Name == "门诊挂号" {
 			item.Childs = append(item.Childs, subPurviewTreeViewModel...)
@@ -306,6 +319,10 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		if item.Name == "门诊收费" {
 			item.Childs = append(item.Childs, subPurviewTreeViewModelThree...)
 		}
+
+		if item.Name == "住院工作站" {
+			item.Childs = append(item.Childs, subPurviewTreeViewModelFour...)
+		}
 	}
 
 	//电子病历

controllers/stock_in_api_controller.go

@@ -1821,7 +1821,7 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword, startTime, endTime, type_name)
 	info, err := service.GetCoutWareseOutInfo(startTime, endTime, adminUserInfo.CurrentOrgId)
 
-	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId)
+	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId, "")
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":           list,

enums/error_code.go

@@ -228,6 +228,10 @@ const ( // ErrorCode
 	ErrorCodeNoBloodPatientException = 300002
 
 	ErrorCodeOrderParamWrong = 300003
+
+	ErrorCodeHisPatientParamWrong = 300004
+
+	ErrorCodeOutOfStockParamWrong = 300300
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -446,6 +450,10 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeNoBloodPatientException: "找不到该患者,请先在系统录入患者信息或检查患者身份证信息",
 
 	ErrorCodeOrderParamWrong: "结算记录不存在",
+
+	ErrorCodeHisPatientParamWrong: "订单正在结算、请先结算完成",
+
+	ErrorCodeOutOfStockParamWrong: "库存不足",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -1041,6 +1041,11 @@ type NewDialysisBeforePrepareGoods struct {
 	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count             int64  `gorm:"column:count" json:"count" form:"count"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 }
 
 type QueueCallConfig struct {

models/drug.go

@@ -21,6 +21,27 @@ type BaseDrugLib struct {
 	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                  string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias             string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin       string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi         string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory          int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType              int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit        string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace       string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm        int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit               string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber             int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit               string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                  float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string  `gorm:"column:Dose_unit" json:"Dose_unit" form:"Dose_unit"`
+	MinPrice              string  `gorm:"column:min_price" json:"min_price" form:"min_price"`
+
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
@@ -60,12 +81,19 @@ type BaseDrugLib struct {
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	DrugDay string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total   float64 `gorm:"column:total" json:"total" form:"total"`
+	Dosage       string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval        string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit  string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total        float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (BaseDrugLib) TableName() string {

models/his_hospital_models.go

@@ -0,0 +1,80 @@
+package models
+
+type HisHospitalOrder 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"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate    int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	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"`
+	Number                string  `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	OrderStatus           float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PayWay                int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	MdtrtId               string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	MzNumber              string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+}
+
+func (HisHospitalOrder) TableName() string {
+	return "his_order"
+}
+
+type HisHospitalCheckRecord struct {
+	ID                   int64            `gorm:"column:id" json:"id" form:"id"`
+	Name                 string           `gorm:"column:name" json:"name" form:"name"`
+	MedicalTreatmentType int64            `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	RecordDate           int64            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IdCardNo             string           `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	AdminUserId          int64            `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments          int64            `gorm:"column:departments" json:"departments" form:"departments"`
+	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"`
+	Doctor               int64            `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	PsnNo                string           `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType          string           `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno               string           `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName              string           `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                 string           `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                 string           `gorm:"column:naty" json:"naty" form:"naty"`
+	MedType              int64            `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Brdy                 string           `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                string           `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo             string           `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo             string           `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	AdmBed               int64            `gorm:"column:adm_bed" json:"adm_bed" form:"adm_bed"`
+	IdCardType           int64            `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	Diagnosis            string           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType             int64            `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	MdtrtCertType        string           `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime       string           `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime      string           `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	InHospitalStatus     int64            `gorm:"column:in_hospital_status" json:"in_hospital_status" form:"in_hospital_status"`
+	Certificates         int64            `gorm:"column:certificates" json:"certificates" form:"certificates"`
+	InsutypeType         string           `gorm:"column:insutype_type" json:"insutype_type" form:"insutype_type"`
+	OutHospitalStatus    int64            `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
+	OutWay               int64            `gorm:"column:out_way" json:"out_way" form:"out_way"`
+	Phone                string           `gorm:"column:phone" json:"phone" form:"phone"`
+	HisHospitalOrder     HisHospitalOrder `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"order"`
+}
+
+func (HisHospitalCheckRecord) TableName() string {
+	return "his_hospital_check_record"
+}

models/his_models.go

@@ -234,6 +234,8 @@ type HisDoctorAdviceInfo struct {
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
+	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -241,20 +243,75 @@ func (HisDoctorAdviceInfo) TableName() string {
 }
 
 type Drug struct {
-	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName               string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec               string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType               int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit         string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace        string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm         int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer           int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId                  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode               string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {
@@ -328,6 +385,7 @@ type HisPrescriptionInfo struct {
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PType              int64           `gorm:"column:p_type" json:"p_type" form:"p_type"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -356,9 +414,11 @@ type HisPrescription struct {
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
-	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
-	Total                  string                    `gorm:"-" json:"total" form:"total"`
+
+	HisAdditionalCharge   []*HisAdditionalCharge `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
+	VMHisPrescriptionInfo HisPrescriptionInfo    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	Total                 string                 `gorm:"-" json:"total" form:"total"`
+	PType                 int64                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
 }
 
 func (HisPrescription) TableName() string {
@@ -475,14 +535,75 @@ func (HisDoctorAdviceParentTemplate) TableName() string {
 }
 
 type VMDrug struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (VMDrug) TableName() string {
@@ -542,8 +663,20 @@ type HisPrescriptionProject struct {
 	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	Day                string     `gorm:"column:day" json:"day" form:"day"`
 	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit   string `gorm:"column:unit" json:"unit" form:"unit"`
+	Type   int64  `gorm:"column:type" json:"type" form:"type"`
+
+	Doctor         int64 `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	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"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker        int64 `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -580,13 +713,17 @@ type HisProjectListVm struct {
 }
 
 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"`
+	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"`
+	TeamId       int64        `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	Type         int64        `gorm:"column:type" json:"type" form:"type"`
+	XtHisProject XtHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	GoodInfo     GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
 }
 
 func (XtHisProjectList) TableName() string {
@@ -707,15 +844,25 @@ type HisOrder struct {
 	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+
+	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 
-	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
-	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisOrderInfo           HisOrderInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	Patients               Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             HisPatient             `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"his_patient"`
+	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"his_hospital_patient"`
+
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+
+	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 }
 
 func (HisOrder) TableName() string {
@@ -874,6 +1021,19 @@ func (XtHisConfig) TableName() string {
 	return "xt_his_config"
 }
 
+type XtHisProjectConfig 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"`
+	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"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtHisProjectConfig) TableName() string {
+	return "xt_his_project_config"
+}
+
 type XtHisTemplate 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"`
@@ -1014,3 +1174,146 @@ type BusinessParams struct {
 	MdtrtId          string
 	SetlId           string
 }
+
+type HisFundSettleListResult struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	Number    string `gorm:"column:number" json:"number" form:"number"`
+	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"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsUpload  int64  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	OrderId   int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+}
+
+func (HisFundSettleListResult) TableName() string {
+	return "his_fund_settle_list_result"
+}
+
+type HisPrescriptionTemplate 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"`
+	Type      int64  `gorm:"column:type" json:"type" form:"type"`
+	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"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Mode      int64  `gorm:"column:mode" json:"mode" form:"mode"`
+}
+
+func (HisPrescriptionTemplate) TableName() string {
+	return "his_prescription_template"
+}
+
+type HisPrescriptionAdviceTemplate 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"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Drug                  Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+}
+
+func (HisPrescriptionAdviceTemplate) TableName() string {
+	return "his_prescription_advice_template"
+}
+
+type HisPrescriptionProjectTemplate 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"`
+	Count              int64        `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string       `gorm:"column:day" json:"day" form:"day"`
+	Remark             string       `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string       `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64        `gorm:"column:type" json:"type" form:"type"`
+	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	XtHisProject       XtHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	GoodInfo           GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+}
+
+func (HisPrescriptionProjectTemplate) TableName() string {
+	return "his_prescription_project_template"
+}
+
+type HisPrescriptionInfoTemplate 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"`
+	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"`
+	Type                           int64                             `gorm:"column:type" json:"type" form:"type"`
+	Creator                        int64                             `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                       int64                             `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	PType                          int64                             `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PTemplateId                    int64                             `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
+	HisPrescriptionAdviceTemplate  []*HisPrescriptionAdviceTemplate  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProjectTemplate []*HisPrescriptionProjectTemplate `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+}
+
+func (HisPrescriptionInfoTemplate) TableName() string {
+	return "his_prescription_info_template"
+}

models/inspection_models.go

@@ -10,7 +10,7 @@ type Inspection struct {
 	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
 	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
 	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
-	InspectTips	 string `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
+	InspectTips  string `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
 	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`

models/self_drug_models.go

@@ -63,6 +63,9 @@ type XtBaseDrug struct {
 	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (XtBaseDrug) TableName() string {

models/service/stock_service.go

@@ -507,19 +507,22 @@ func (VMDrugWarehouseInfo) TableName() string {
 }
 
 type Drug struct {
-	ID              int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName        string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec        string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType        int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit  string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm  int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total           float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {

models/stock_models.go

@@ -80,6 +80,7 @@ type WarehousingInfo struct {
 	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date"`
 	WarehousingCount int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
 	WarehousingUnit  string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	StockNumber      int64       `gorm:"column:stock_number" json:"stock_number"`
 	Price            float64     `gorm:"column:price" json:"price"`
 	TotalPrice       float64     `gorm:"column:total_price" json:"total_price"`
 	Dealer           int64       `gorm:"column:dealer" json:"dealer"`

routers/router.go

@@ -54,6 +54,9 @@ func init() {
 	controllers.ManagerCenterRegistRouters()
 	controllers.DrugStockManagerApiRegistRouters()
 	controllers.HisManagerApiRegistRouters()
+	controllers.HisConfigApiRegistRouters()
+
+	controllers.HisHospitalManagerApiRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
 	new_m_api.NewMobileAPIControllersRegisterRouters()
@@ -70,7 +73,7 @@ func init() {
 	controllers.DialysisPrameteRoutes()
 	new_m_api.DialysisParameterApiControllersRegisterRouters()
 	controllers.SelfDrugRouters()
-	new_m_api.NewDrugApiControllersRegisterRouters()
+	//new_m_api.NewDrugApiControllersRegisterRouters()
 	controllers.HisProjectRouters()
 	controllers.GdybRegistRouters()
 

service/app_version.go

@@ -256,3 +256,18 @@ func UpDateHis(his *models.HisDoctorAdviceInfo) {
 func UpDateHis2(his *models.HisPrescriptionProject) {
 	writeDb.Save(&his)
 }
+
+func GetAllHisOrder() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2 AND settle_accounts_date < 1623168000").Find(&his).Error
+	return
+}
+
+func GetLastHisOrder() (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 4 AND status = 1 AND order_status = 2").Last(&his).Error
+	return
+}
+
+func SaveOrder(his *models.HisOrder) {
+	writeDb.Save(&his)
+
+}

service/dialysis_service.go

@@ -1027,7 +1027,7 @@ func GetMaxLongAdviceGroupID(orgId int64, patient_id int64) (group int64) {
 }
 
 func GetLastLongAdviceByGroupNo(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }
 
@@ -1196,3 +1196,18 @@ func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (er
 	ut.Commit()
 	return err
 }
+
+func FindHisProjectById(orgID int64, id int64) (advice models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
+	return
+}
+
+func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
+	err = writeDb.Save(&advice).Error
+	return
+}
+
+func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	return
+}

service/drug_stock_service.go

@@ -19,6 +19,9 @@ type DrugConfig struct {
 	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total        float64      `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (DrugConfig) TableName() string {
@@ -69,22 +72,26 @@ func FindStockInNumber(orgId int64) (stockIns []*DrugWarehouseInfo, err error) {
 }
 
 type DrugStockInfo struct {
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	RetailPrice float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugStatus  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	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"`
-	OrgId       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName     string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec     string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice    float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugStatus   string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	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"`
+	OrgId        int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode     string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag  int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 
 	QueryWarehousingInfo  []models.DrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehousing_info"`
 	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`
 	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
 	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
+
+	Total float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (DrugStockInfo) TableName() string {

service/gobal_config_service.go

@@ -195,7 +195,23 @@ func CreateXTHisRecord(config *models.XtHisConfig) (err error) {
 	return
 }
 
-func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64) (order []*models.HisOrder, err error) {
+//TODO:项目开关
+func FindXTHisProjectByOrgId(org_id int64) (err error, config models.XtHisProjectConfig) {
+	err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
+}
+
+func UpdateXTHisProjectRecord(config *models.XtHisProjectConfig) (err error) {
+	err = writeDb.Save(config).Error
+	return
+}
+
+func CreateXTHisProjectRecord(config *models.XtHisProjectConfig) (err error) {
+	err = writeDb.Model(&models.XtHisProjectConfig{}).Create(config).Error
+	return
+}
+
+func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64, p_type int64) (order []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
 	if start_time != 0 {
 		db = db.Where("his_order.settle_accounts_date>=?", start_time)
@@ -204,7 +220,7 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64)
 		db = db.Where("his_order.settle_accounts_date<=?", end_time)
 	}
 
-	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ?", user_org_id)
+	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status > 1 AND p_type = ? ", user_org_id, p_type)
 
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).

service/his_config_service.go

@@ -0,0 +1,48 @@
+package service
+
+import (
+	"XT_New/models"
+	"time"
+)
+
+func GetHisPrescriptionTemplatesList(patient_id int64, org_id int64, page int64, limit int64) (templates []*models.HisPrescriptionTemplate, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND patient_id= ? AND status = 1", org_id, patient_id)
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&templates).Error
+	return
+}
+
+func GetHisPrescriptionTemplateByID(template_id int64) (prescription models.HisPrescriptionTemplate, err error) {
+	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("id = ? AND status = 1 ", template_id).First(&prescription).Error
+	return
+}
+
+func SaveHisPrescriptionTemplate(template *models.HisPrescriptionTemplate) (err error) {
+	err = writeDb.Save(&template).Error
+	return
+
+}
+
+func DelelteHisPrescriptionInfoTemplate(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
+func DelelteHisPrescriptionTemplate(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
+func DelelteHisPrescriptionAdviceTemplate(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
+func DelelteHisPrescriptionProjectTemplate(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
+	return
+}

service/his_hospital_service.go

@@ -0,0 +1,174 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
+
+type HospitalPatient 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"`
+	IdCardNo               string                        `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType           int64                         `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Schedule               Schedule                      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
+	HisHospitalCheckRecord models.HisHospitalCheckRecord `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	VMHisPrescriptionInfo  VMHisPrescriptionInfo         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	//HisHospitalOrder       models.HisHospitalOrder       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
+}
+
+func (HospitalPatient) TableName() string {
+	return "xt_patients"
+}
+
+func GetHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
+	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1 AND record.out_hospital_status = 0", org_id)
+	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id)
+	})
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
+func GetNewAllChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
+	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Joins("join his_hospital_check_record as hp ON hp.patient_id = xt_patients.id  AND hp.status = 1 AND hp.user_org_id = ? ", org_id)
+
+	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? AND in_hospital_status = 1", org_id).Preload("HisHospitalOrder", "user_org_id = ? AND status = 1", org_id)
+	})
+	//db = db.Preload("HisHospitalOrder", "user_org_id = ? AND status = 1 ", org_id)
+	err = db.Group("id").Find(&patients).Error
+	return
+}
+
+func GetNewHisHospitalPatientInfo(his_patient_id int64) (info models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("id = ? AND status = 1 ", his_patient_id).First(&info).Error
+	return
+}
+
+func GetUnChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 ", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+//
+type VMHospitalPatient 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"`
+	IdCardNo               string                        `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType           int64                         `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Schedule               Schedule                      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
+	HisHospitalCheckRecord models.HisHospitalCheckRecord `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	VMHisPrescriptionInfo  VMHisPrescriptionInfo         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+}
+
+func (VMHospitalPatient) TableName() string {
+	return "xt_patients"
+}
+
+//
+//
+//func GetHisHospitalPatientPrescriptionList(org_id int64, record_date int64,page int64, limit int64) (patients []*HospitalPatient, err error) {
+//	offset := (page - 1) * limit
+//	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+//	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ?", org_id)
+//	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+//		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id)
+//	})
+//	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+//	return
+//}
+
+//
+//func GetHisHospitalPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMSchedule, err error, total int64) {
+//	offset := (page - 1) * limit
+//	db := readDb.Model(&VMHospitalPatient{}).Where("user_org_id = ? AND status = 1", org_id)
+//	if len(keywords) > 0 {
+//		keywords = "%" + keywords + "%"
+//		db = db.Joins("JOIN xt_patients as p On xt_schedule.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
+//		db = db.Joins("JOIN his_prescription_info as info On xt_schedule.patient_id = info.patient_id  AND info.user_org_id = ? AND  info.record_date = ? AND info.prescription_number like ? AND info.p_type == 1", org_id, record_date, keywords)
+//	}
+//	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+//	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1", org_id)
+//	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND p_type == 1", org_id).
+//		Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND p_type == 1", org_id)
+//	db = db.Count(&total)
+//	err = db.Limit(limit).Offset(offset).Find(&patients).Error
+//	return
+//}
+
+type VMHisHospitalPrescriptionInfo 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          int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64              `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string             `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        string             `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"`
+	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"`
+	SickType           int64              `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	Patients           Patients           `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
+	HisPrescription    []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"prescription"`
+}
+
+func (VMHisHospitalPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
+}
+
+func GetHisHospitalPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1 ", org_id, record_date)
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients as p On his_prescription_info.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
+	}
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND p_type = 1", org_id)
+	db = db.Count(&total)
+	err = db.Limit(limit).Offset(offset).Find(&patients).Error
+	return
+}

service/his_project_service.go

@@ -72,7 +72,7 @@ func DeleteHisProject(id int64) error {
 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
+	err := XTReadDB().Model(&projectTeam).Where("project_team = ? and user_org_id = ? and status = 1", projectName, orgid).First(&projectTeam).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, err
@@ -262,6 +262,13 @@ func CreateHisPatient(patient *models.XtHisPatient) error {
 	return err
 }
 
+func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+
+	return
+}
+
 func GetBloodPatientByIdCard(idcard string, orgid int64) (*models.XtPatients, error) {
 	var patients models.XtPatients
 	var err error
@@ -282,16 +289,15 @@ func GetAllProjectTeam(orgid int64) (project []*models.XtHisProjectTeam, err err
 	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
+func GetProjectListById(orgid int64, ids []string) (project []*models.XtHisProjectList, err error) {
+	err = XTReadDB().Model(&project).Preload("XtHisProject", "status = 1").Preload("GoodInfo", "status=1").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")
-
+	db := XTReadDB().Table("his_patient as x")
 	if len(keyword) > 0 {
 		db = db.Where("x.name like ?", likeKey)
 	}
@@ -307,7 +313,6 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	db = db.Preload("HisOrder", "status = 1 AND 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,x.is_return,x.doctor,x.ctime,x.social_type,x.phone,x.status").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
 	return hisPatient, total, err
 }
@@ -393,11 +398,9 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return XTReadDB().Where("user_org_id=? and status=1", orgid).Preload("Drug", func(db *gorm.DB) *gorm.DB {
-			return XTReadDB().Where("status = 1")
-		})
-	}).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1")
+	}).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }
@@ -541,7 +544,7 @@ func GetChargePrintTemplate(orgid int64) (models.XtHisChargeTemplate, error) {
 func GetDoctorProjectItem(patientid int64, record_date int64) (models.HisPrescriptionProject, error) {
 
 	project := models.HisPrescriptionProject{}
-	err := XTReadDB().Model(&project).Where("patient_id = ? and record_date = ? and status = 1", patientid, record_date).Preload("HisProject", "status = 1").Find(&project).Error
+	err := XTReadDB().Model(&project).Where("patient_id = ? and record_date = ? and status = 1", patientid, record_date).Preload("HisProject").Find(&project).Error
 	return project, err
 }
 
@@ -591,9 +594,9 @@ func GetPrscriptionInfo(patientid int64, recorddata int64) (info []*models.HisPr
 
 }
 
-func GetPrescriptionByPatientId(patient_id int64, startime int64) (prescritpion []*models.HisPrescription, err error) {
+func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescritpion []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? and record_date =?", patient_id, startime).Find(&prescritpion).Error
+	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? and record_date =? AND p_type = ?", patient_id, startime, p_type).Find(&prescritpion).Error
 	return prescritpion, err
 }
 
@@ -698,3 +701,14 @@ func GetLastItem(orgid int64) (models.XtHisProjectList, error) {
 	err := XTReadDB().Model(&list).Where("user_org_id = ? and status = 1", orgid).Last(&list).Error
 	return list, err
 }
+
+func SaveProjectTeam(team *models.XtHisProjectTeam) error {
+
+	err := XTWriteDB().Model(&team).Save(&team).Error
+	return err
+}
+
+func GetProjectHisListByIds(ids []string) (hisProjectList []*models.XtHisProjectList, error error) {
+	error = XTReadDB().Model(&hisProjectList).Preload("XtHisProject").Preload("GoodInfo", "status = 1").Where(" status = 1 and id in (?)", ids).Find(&hisProjectList).Error
+	return hisProjectList, error
+}

service/mobile_dialysis_service.go

@@ -1504,6 +1504,8 @@ type VMGoodInfo struct {
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id"`
 	OrgId             int64  `gorm:"column:org_id" json:"org_id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit          int64  `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
 }
 
 func (VMGoodInfo) TableName() string {
@@ -2103,3 +2105,15 @@ func GetHisAdviceExecutionById(ids []string) (doctor []*models.HisDoctorAdviceIn
 	err = XTReadDB().Model(&doctor).Where("id IN(?) AND status = 1", ids).Find(&doctor).Error
 	return doctor, err
 }
+
+func GetHisProjectConfig(orgid int64) (models.XtHisProjectConfig, error) {
+	config := models.XtHisProjectConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status =1", orgid).Find(&config).Error
+	return config, err
+}
+
+func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status=1").Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
+
+	return
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -531,21 +531,22 @@ type ScheduleVM struct {
 	BedID        int64 `gorm:"column:bed_id" json:"bed_id"`
 	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
 
-	Patient                  *PatientVM                    `gorm:"ForeignKey:PatientID" json:"patient"`
-	DialysisOrder            DialysisOrderVM               `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
-	Prescription             PrescriptionVM                `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
-	ReceiveAssessment        ReceiveAssessmentVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
-	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses      `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
-	AssessmentBeforeDislysis AssessmentBeforeDislysisVM    `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  AssessmentAfterDislysisVM     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
-	MonitoringRecords        []*MonitoringRecordVM         `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
-	DeviceNumber             *DeviceNumberVM               `gorm:"ForeignKey:BedID" json:"device_number"`
-	DeviceZone               *DeviceZoneVM                 `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	Advices                  []*DoctorAdviceVM             `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
-	DoubleCheck              *DoubleCheckVM                `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
-	Summer                   *SummerVM                     `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
-	LastAfterWeight          XtAssessmentAfterDislysisVM   `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
-	HisAdvices               []*models.HisDoctorAdviceInfo `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
+	Patient                  *PatientVM                       `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM                  `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM                   `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM       `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM            `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM                  `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM                    `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM                `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM                   `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM      `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
+	HisProject               []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
 }
 
 func (ScheduleVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -47,6 +47,9 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 				Where("user_org_id = ? AND status = 1", orgID).
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
 		}).
+		Preload("HisProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("XtHisProject").Preload("GoodInfo", "status=1")
+		}).
 		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
 		Find(&schedules).
 		Error

service/self_drug_service.go

@@ -532,6 +532,8 @@ type Drugs struct {
 	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+	HospApprFlag       int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag        int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (Drugs) TableName() string {

service/stock_service.go

@@ -463,6 +463,10 @@ func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err err
 
 }
 
+//func FindFirstWarehousingInfoByStock(good_id int64,good_type_id int64) (info models.WarehousingInfo, err error) {
+//	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", order).Order("ctime").First(&info).Error
+//	return info, err
+//}
 func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
 	return info, err
@@ -480,6 +484,12 @@ func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, er
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
 	return info, err
 }
+//
+//// 出库时先进先出，找出最先入库的批次
+//func  (drug_id int64) (info models.WarehousingInfo, err error) {
+//	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
+//	return info, err
+//}
 
 func FindLastDrugWarehousingInfo(order string) (info models.DrugWarehouseInfo, err error) {
 	err = readDb.Model(&models.DrugWarehouseInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
@@ -1634,6 +1644,11 @@ func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
 	return err
 }
 
+//func UpDateWarehouseInfoByStockDelete(id int64,count int64) (err error) {
+//	err = DB.Model(&models.WarehousingInfo{}).Where("id = ?",info.ID).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+//	return err
+//}
+
 func UpDateDrugWarehouseOutStatus(id int64) (err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
@@ -2362,9 +2377,15 @@ func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutI
 	return houseOutInfo, err
 }
 
-func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+func GetGoodInfomationList(orgid int64, keyword string) (goodInfo []*models.GoodInfo, err error) {
+	key := "%" + keyword + "%"
+	if len(keyword) == 0 {
+		err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+
+	} else {
+		err = XTReadDB().Where("org_id = ? and status = 1 AND good_name like ?", orgid, key).Find(&goodInfo).Error
 
-	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	}
 	return goodInfo, err
 }
 

service/user_service.go

@@ -55,6 +55,14 @@ func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 	return
 }
 
+func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
+	//fmt.Println("orgid", orgId)
+	//fmt.Println("appid", appid)
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	return
+}
+
 func GetAdminUser(orgId, appid, id int64) (*AdminUserList, error) {
 	var err error
 	var user AdminUserList

service/warhouse_service.go

@@ -871,6 +871,553 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				CreateAutoReduceRecord(&details)
 			}
 		}
+//
+//import (
+//	"XT_New/models"
+//	"XT_New/utils"
+//	"errors"
+//	"fmt"
+//	_ "fmt"
+//	"github.com/jinzhu/gorm"
+//	"math"
+//	"strconv"
+//	"strings"
+//	"time"
+//)
+//
+//// 药品出库
+//
+//func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
+//	// 1.判断药品是否来自专用字典的药品库
+//	// 2.判断当天当前机构有没有创建出库单，没有则创建
+//	// 3.创建出库流程
+//	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+//	isHasWay := false
+//	record_time := int64(0)
+//	if advice.Way == 1 {
+//		isHasWay = true
+//		record_time = advice.RecordDate
+//	}
+//	if isHasWay {
+//		//判断当天当前机构有没有创建出库单，没有则创建
+//		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
+//		if err == gorm.ErrRecordNotFound {
+//			timeStr := time.Now().Format("2006-01-02")
+//			timeArr := strings.Split(timeStr, "-")
+//			total, _ := FindAllDrugWarehouseOut(orgID)
+//			total = total + 1
+//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+//			number = number + total
+//			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+//			// creater := adminUserInfo.AdminUser.Id
+//			warehouseOut := models.DrugWarehouseOut{
+//				WarehouseOutOrderNumber: warehousing_out_order,
+//				OperationTime:           time.Now().Unix(),
+//				OrgId:                   orgID,
+//				Creater:                 0,
+//				Ctime:                   time.Now().Unix(),
+//				Status:                  1,
+//				WarehouseOutTime:        record_time,
+//				Dealer:                  0,
+//				Manufacturer:            0,
+//				Type:                    1,
+//				IsSys:                   1,
+//			}
+//			err := AddSigleDrugWarehouseOut(&warehouseOut)
+//			if err != nil {
+//				utils.TraceLog("创建出库单失败 err = %v", err)
+//				return err
+//			} else {
+//				out = warehouseOut
+//			}
+//		}
+//
+//		// 出库流程
+//		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+//		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
+//		if drup.ID > 0 {
+//			prescribingNumber := advice.PrescribingNumber
+//			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+//		} else {
+//			return errors.New("药品信息不存在")
+//		}
+//
+//	}
+//
+//	return
+//}
+//
+//// 药品出库 递归方式
+//func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
+//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+//	var deliver_number int64 = 0
+//	var stock_number int64 = 0
+//
+//	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+//	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+//	if advice.PrescribingNumberUnit == drup.MaxUnit {
+//		deliver_number = count * drup.MinNumber
+//	} else {
+//		deliver_number = count
+//	}
+//
+//	// 根据先进先出原则，查询最先入库的批次，进行出库
+//	// 如果没有对应的库存，则报错
+//	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+//	fmt.Println("查询222222222222222222222222222222222222222222222222", err)
+//	if err != nil {
+//		return err
+//	}
+//
+//	// 将该批次的剩余库存数量转换为拆零数量
+//	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+//	if stock_number >= deliver_number {
+//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseout.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           advice.RecordDate,
+//			DrugId:                  advice.DrugId,
+//		}
+//		warehouseOutInfo.Count = deliver_number
+//		warehouseOutInfo.CountUnit = drup.MinUnit
+//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+//			// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+//			details := &models.DrugAutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               advice.PatientId,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              advice.RecordDate,
+//				OrgId:                   orgID,
+//				DrugId:                  advice.DrugId,
+//				Count:                   deliver_number,
+//				CountUnit:               drup.MinUnit,
+//			}
+//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要减去对应批次的库存数量
+//		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
+//		var maxNumber int64 = 0
+//		var minNumber int64 = 0
+//		if advice.PrescribingNumberUnit == drup.MinUnit {
+//			maxNumber = count / drup.MinNumber
+//			minNumber = count % drup.MinNumber
+//		} else {
+//			maxNumber = count
+//		}
+//
+//		if warehouse.StockMaxNumber < maxNumber {
+//			return errors.New("库存数量不足")
+//		}
+//
+//		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+//		warehouse.Mtime = time.Now().Unix()
+//		if warehouse.StockMinNumber < minNumber {
+//			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+//			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+//		} else {
+//			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+//		}
+//
+//		if warehouse.StockMaxNumber < 0 {
+//			return errors.New("库存数量不足")
+//		}
+//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		return nil
+//	} else {
+//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseout.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           advice.RecordDate,
+//			DrugId:                  advice.DrugId,
+//		}
+//		// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+//		// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+//		warehouseOutInfo.Count = stock_number
+//		warehouseOutInfo.CountUnit = drup.MinUnit
+//
+//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.DrugAutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               advice.PatientId,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              advice.RecordDate,
+//				OrgId:                   orgID,
+//				DrugId:                  advice.DrugId,
+//				Count:                   stock_number,
+//				CountUnit:               drup.MinUnit,
+//			}
+//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要将该批次库存清零
+//		warehouse.StockMaxNumber = 0
+//		warehouse.StockMinNumber = 0
+//		warehouse.Mtime = time.Now().Unix()
+//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+//		prescribingNumber_two_temp := deliver_number - stock_number
+//		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+//		advice.PrescribingNumberUnit = drup.MinUnit
+//		DrugDeliverInfo(orgID, prescribingNumber, warehouseout, drup, advice)
+//	}
+//	return
+//}
+//
+//// 耗材出库
+//func ConsumablesDeliveryTotal(orgID int64,patient_id int64,record_time int64,goods []models.DialysisBeforePrepareGoods) (err error) {
+//	//查询该患者当天已经出库的耗材信息
+//	goods_yc,_ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
+//	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
+//	for i := len(goods_yc) - 1; i >= 0; i--{
+//		goods_yc_temp := goods_yc[i]
+//		for j := len(goods) - 1; j >= 0; j-- {
+//			goods_temp := goods[j]
+//			// 已经出库和新请求出库都存在该耗材，则判断出库数量，分成是继续出库，还是删除出库
+//			if goods_yc_temp.GoodTypeId == goods_temp.GoodTypeId && goods_yc_temp.GoodId == goods_temp.GoodId{
+//				// 已经出库和新请求出库的出库数量一致，则清除两个结构体里的数据（既不出库，也不删除出库）
+//				if goods_yc_temp.Count == goods_temp.Count {
+//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
+//					goods = append(goods[:j],goods[j+1:]...)
+//				}
+//
+//				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
+//				if goods_yc_temp.Count > goods_temp.Count {
+//					temp_count := goods_yc_temp.Count - goods_temp.Count
+//					goods_yc[i].Count = temp_count
+//					goods = append(goods[:j],goods[j+1:]...)
+//				}
+//
+//				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
+//				if goods_yc_temp.Count < goods_temp.Count {
+//					temp_count := goods_temp.Count - goods_yc_temp.Count
+//					goods[j].Count = temp_count
+//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
+//				}
+//			}
+//		}
+//	}
+//
+//	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
+//	// goods 这个数据就是需要出库的耗材的数据
+//	if len(goods) > 0 {
+//		out, err := FindStockOutByIsSys(orgID, 1, record_time)
+//		if err == gorm.ErrRecordNotFound {
+//			//没有记录，则创建出库单
+//			timeStr := time.Now().Format("2006-01-02")
+//			timeArr := strings.Split(timeStr, "-")
+//			total, _ :=  FindAllWarehouseOut(orgID)
+//			total = total + 1
+//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+//			number = number + total
+//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+//			warehouseOut := models.WarehouseOut{
+//				WarehouseOutOrderNumber: warehousing_out_order,
+//				OperationTime:           time.Now().Unix(),
+//				OrgId:                   orgID,
+//				Creater:                 0,
+//				Ctime:                   time.Now().Unix(),
+//				Status:                  1,
+//				WarehouseOutTime:        record_time,
+//				Dealer:                  0,
+//				Manufacturer:            0,
+//				Type:                    1,
+//				IsSys:                   1,
+//			}
+//			err := AddSigleWarehouseOut(&warehouseOut)
+//			if err != nil {
+//				utils.TraceLog("创建出库单失败 err = %v", err)
+//				return err
+//			} else {
+//				out = warehouseOut
+//			}
+//		}
+//		for _,good := range goods {
+//			ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
+//		}
+//	}
+//
+//	if len(goods_yc) > 0 {
+//		for _,good_yc := range goods_yc{
+//			ConsumablesDeliveryDelete(orgID ,patient_id ,record_time ,good_yc ,out )
+//		}
+//	}
+//
+//	return nil
+//}
+//
+//// 耗材出库
+//func ConsumablesDelivery(orgID int64,patient_id int64,record_time int64,goods models.DialysisBeforePrepareGoods,warehouseOut models.WarehouseOut) (err error) {
+//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+//	var deliver_number int64 = 0
+//	var stock_number int64 = 0
+//
+//	deliver_number = good.Count
+//
+//
+//	// 根据先进先出原则，查询最先入库的批次，进行出库
+//	// 如果没有对应的库存，则报错
+//	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId,goods.GoodTypeId)
+//	if err != nil {
+//		return err
+//	}
+//
+//	// 将该批次的剩余库存数量转换为拆零数量
+//	stock_number = warehouse.StockCount
+//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+//	if stock_number >= deliver_number {
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods.GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = goods.Count
+//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   goods.Count,
+//			}
+//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//
+//		// 出库完成后，要减去对应批次的库存数量
+//
+//		maxNumber = goods.Count
+//
+//
+//		if warehouse.StockMaxNumber < maxNumber {
+//			return errors.New("库存数量不足")
+//		}
+//
+//		warehouse.StockNumber = warehouse.StockMaxNumber - maxNumber
+//		warehouse.Mtime = time.Now().Unix()
+//
+//
+//		if warehouse.StockNumber < 0 {
+//			return errors.New("库存数量不足")
+//		}
+//		errThree := UpDateWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		return nil
+//	}  else {
+//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods..GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = stock_number
+//		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   goods.Count,
+//			}
+//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要将该批次库存清零
+//		warehouse.StockNumber = 0
+//		warehouse.Mtime = time.Now().Unix()
+//		errThree := UpDateWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+//		goods.Count := deliver_number - stock_number
+//
+//		ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
+//	}
+//	return nil
+//}
+//
+//// 耗材出库删除
+//func ConsumablesDeliveryDelete(orgID int64,patient_id int64,record_time int64,good_yc models.DialysisBeforePrepare,warehouseOut models.WarehouseOut) (err error) {
+//	// 先根据相关信息查询当天该耗材的出库信息
+//	warehouseOutInfos,err :=FindStockOutInfoByStock(orgID,good_yc.GoodTypeId,good_yc.GoodId,record_time,patient_id)
+//	if err != nil {
+//		return err
+//	}
+//
+//	var delete_count int64 = 0
+//
+//	for _ , ware := range warehouseOutInfos{
+//		// 判断当前出库的数据和删除出库数量
+//		if good_yc.Count <= ware.Count {
+//			delete_count = good_yc.Count
+//		} else {
+//			delete_count = ware.Count
+//		}
+//		// 在出库记录表里记录退库详情
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   2,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods..GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = delete_count
+//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   delete_count,
+//				Type:					 2,
+//			}
+//			errTwo := AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//
+//		// 删除出库完成后，要增加对应批次的库存数量
+//
+//
+//
+//		errThree := UpDateWarehouseInfoByStockDelete(ware.WarehouseInfoId,delete_count)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		// 增加了对应的库存后，看看还有多少需要退库的
+//		good_yc.Count = goods_yc.Count - delete_count
+//		if good_yc.Count == 0 {
+//			return nil
+//		}
+//	}
+//
+//	if good_yd.Count == 0 {
+//		return nil
+//	}  else {
+//		return errors.New("退库和出库数据不匹配")
+//	}
+//}
 
 		// 出库完成后，要减去对应批次的库存数量