医保对接

controllers/base_api_controller.go

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

controllers/dialysis_api_controller.go

@@ -327,11 +327,11 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -656,11 +656,11 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisIrrigation:       dialysis_irrigation,
-		DialysisDialyszers:       dialysis_dialyszers,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                     blood,
+		DialysisIrrigation:        dialysis_irrigation,
+		DialysisDialyszers:        dialysis_dialyszers,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
+		DisplaceSpeed:             displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1100,7 +1100,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fmt.Println("丰管业配置", data.SealingFluidDispose)
+
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 	assessment.DialysisOrderId = data.DialysisOrderId
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
@@ -1163,6 +1163,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.DiastolicPressure = data.DiastolicPressure
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
+	assessment.Ktv = data.Ktv
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -2459,7 +2460,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)
@@ -2515,6 +2516,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,
@@ -3010,12 +3038,13 @@ func (c *DialysisApiController) GetSchedule() {
 	schedual_type, _ := c.GetInt64("schedual_type")
 	adminUserInfo := c.GetAdminUserInfo()
 
-	timeLayout := "2006-01-02 15:04:05"
-
-	date := time.Now().Format("2006-01-02") + " 00:00:00"
-	loc, _ := time.LoadLocation("Local")
-	theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
-	scheduleTime := theStartTime.Unix()
+	//timeLayout := "2006-01-02 15:04:05"
+	//
+	//date := time.Now().Format("2006-01-02") + " 00:00:00"
+	//loc, _ := time.LoadLocation("Local")
+	//theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
+	//scheduleTime := theStartTime.Unix()
+	scheduleTime, _ := c.GetInt64("record_date")
 
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.CurrentOrgId, scheduleTime, schedual_type)
 

controllers/dialysis_record_api_controller.go

@@ -553,6 +553,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 func (this *DialysisRecordAPIController) StartDialysis() {
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
+	fmt.Println("上机日期222222222222222222222222", recordDateStr)
 	nurseID, _ := this.GetInt64("nurse")
 	punctureNurseId, _ := this.GetInt64("puncture_nurse")
 	startDateStr := this.GetString("start_time")

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")
@@ -84,7 +86,7 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/monitor/getmonitorconfig", &GobalConfigApiController{}, "Get:GetMonitorConfig")
 	beego.Router("/api/order/addorderconfig", &GobalConfigApiController{}, "Get:AddOrderConfig")
 	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
-
+	beego.Router("/api/drugstock/getdrugautomaticlist", &GobalConfigApiController{}, "Get:GetDrugAutoMaticList")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1379,20 +1381,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,
 	})
 
 }
@@ -1404,6 +1466,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
@@ -1427,7 +1491,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,
 	})
@@ -1700,3 +1764,24 @@ func (c *GobalConfigApiController) GetOrderConfig() {
 		"config": config,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugAutoMaticList() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	warehous_out_id, _ := c.GetInt64("warehous_out_id")
+	record_time, _ := c.GetInt64("record_time")
+	warehouse_out_order_number := c.GetString("warehouse_out_order_number")
+	drugConfig, _ := service.GetDrugStockConfig(orgId)
+	list, err := service.GetDrugAutoMaticList(orgId, warehous_out_id, record_time, warehouse_out_order_number)
+	drugList, err := service.GetAllBaseDrugList(orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"drugConfig": drugConfig,
+		"drugList":   drugList,
+	})
+}

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,
 	})
@@ -614,6 +735,9 @@ func (this *HisProjectApiController) GetAllProjectList() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	projectList, err := service.GetAllProjectList(orgId)
+
+	goodInfos, err := service.GetGoodInfomationList(orgId)
+
 	//获取列表数据
 	hisprojectlist, err := service.GetHisProjectListByOrgId(orgId)
 
@@ -624,6 +748,7 @@ func (this *HisProjectApiController) GetAllProjectList() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectList":    projectList,
 		"hisprojectlist": hisprojectlist,
+		"good_info":      goodInfos,
 	})
 	return
 }
@@ -689,12 +814,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,
 	})
 }
 
@@ -812,14 +940,14 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	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
-		}
-	}
+	//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{
@@ -835,25 +963,25 @@ func (this *HisProjectApiController) SaveHisPatient() {
 		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,
+		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{}{
@@ -1404,13 +1532,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/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)
 }
@@ -846,6 +852,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	supine_diastolic_blood_pressure := c.GetString("supine_diastolic_blood_pressure")
 	diastolic_pressure := c.GetString("diastolic_pressure")
 	other_complication := c.GetString("other_complication")
+	ktv := c.GetString("ktv")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -938,6 +945,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		SettingPressure:              setting_pressure,
 		DiastolicPressure:            diastolic_pressure,
 		OtherComplication:            other_complication,
+		Ktv:                          ktv,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1158,11 +1166,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2039,11 +2047,11 @@ func (c *DialysisAPIController) PostSolution() {
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                     blood,
+		DialysisDialyszers:        dialysis_dialyszers,
+		DialysisIrrigation:        dialysis_irrigation,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
+		DisplaceSpeed:             displace_speed,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3075,13 +3083,13 @@ func (c *DialysisAPIController) GetSchedule() {
 	schedual_type, _ := c.GetInt64("schedual_type")
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
-	timeLayout := "2006-01-02 15:04:05"
-
-	date := time.Now().Format("2006-01-02") + " 00:00:00"
-	loc, _ := time.LoadLocation("Local")
-	theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
-	scheduleTime := theStartTime.Unix()
-
+	//timeLayout := "2006-01-02 15:04:05"
+	//
+	//date := time.Now().Format("2006-01-02") + " 00:00:00"
+	//loc, _ := time.LoadLocation("Local")
+	//theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
+	//scheduleTime := theStartTime.Unix()
+	scheduleTime, _ := c.GetInt64("record_date")
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.Org.Id, scheduleTime, schedual_type)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -3553,6 +3561,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 
 			goods, _ := dataBody["goods"].([]interface{})
+			fmt.Println("goods2222222222222", goods)
 			if len(goods) > 0 {
 				for _, item := range goods {
 					items := item.(map[string]interface{})
@@ -3636,7 +3645,7 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 			}
 		}
-
+		fmt.Println("hhhhhhhhhhhhhhhhhhhh", beforePrepares)
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
@@ -3696,6 +3705,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+		fmt.Println("是否有出库单22222222222222222222222", err)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -3800,6 +3810,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						if err == nil {
 
 							count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+
 							if count == 0 {
 								details := &models.AutomaticReduceDetail{
 									WarehouseOutId:          warehouseOutInfo.ID,
@@ -3826,6 +3837,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						}
 
 						count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
+
 						if count == 0 {
 							details := &models.AutomaticReduceDetail{
 								WarehouseOutId:          outInfo.ID,
@@ -3842,6 +3854,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
 						} else if count == 1 {
+							fmt.Println("llllllllllllllllllllll")
 							service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 						}
 						//details := &models.AutomaticReduceDetail{
@@ -3864,7 +3877,9 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 
 			if len(beforePrepares) > 0 { //修改
+
 				for _, consumable := range consumables_source {
+
 					for _, before := range beforePrepares {
 
 						if consumable.GoodId == before.GoodId {
@@ -3874,6 +3889,7 @@ func (c *DialysisAPIController) EditConsumables() {
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
+								fmt.Println("err222222222222222222", err)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
 
 									warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3895,6 +3911,7 @@ func (c *DialysisAPIController) EditConsumables() {
 									warehouseOutInfo.GoodId = before.GoodId
 									warehouseOutInfo.GoodTypeId = before.GoodTypeId
 									err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+									fmt.Println("err2223444444444444444444", err)
 									if err == nil {
 										//可能存在商品使用人不存在的情况，需要先判断商品使用人是否存在
 										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, record_time)
@@ -3953,6 +3970,7 @@ func (c *DialysisAPIController) EditConsumables() {
 												GoodTypeId:              consumable.GoodTypeId,
 												Count:                   before.Count,
 											}
+
 											service.AddSigleAutoReduceRecordInfo(details)
 										} else if err == nil {
 											if user.ID > 0 {
@@ -3969,10 +3987,23 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 		}
 
+		//更新自动出库的地方
 		var errs error
 		if len(beforePrepares) > 0 {
+
 			for _, item := range beforePrepares {
 				errs = service.UpdateDialysisBeforePrepareTwo(item)
+
+				detail := models.AutomaticReduceDetail{
+					PatientId:  item.PatientId,
+					Status:     1,
+					RecordTime: item.RecordDate,
+					OrgId:      item.UserOrgId,
+					GoodId:     item.GoodId,
+					GoodTypeId: item.GoodTypeId,
+					Count:      item.Count,
+				}
+				service.UpdateAutoReduceDetailSix(&detail)
 			}
 		}
 		if errs == nil {
@@ -4273,14 +4304,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{}{
@@ -4288,6 +4321,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

@@ -1242,6 +1242,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
 	groupno, _ := c.GetInt64("groupno", -1)
+
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
@@ -1312,10 +1313,21 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	var err error
 	if groupno > 0 {
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+
 	} else {
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
 	}
 
+	//判断是否开启his
+	errs, config := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
+	//如果开启去修改执行时间
+	if config.IsOpen == 1 {
+		advicesinfo := models.HisDoctorAdviceInfo{
+			ExecutionTime: theTime.Unix(),
+			UpdatedTime:   time.Now().Unix(),
+		}
+		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return
@@ -2909,6 +2921,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 {
@@ -2923,6 +2963,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		}
 	}
 
+	//DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+
 	//透析监测
 	Record, _ := service.FindAllMonitorRecord(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	//透析小结
@@ -2939,8 +2981,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,
@@ -3527,3 +3567,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,21 @@ func (this *MobileHisApiController) GetCallHisPrescription() {
 }
 func (c *MobileHisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
+	projects, _ := service.GetHisPrescriptionProjectsByID(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)
+					}
+				}
+			}
+		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -149,9 +177,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 +228,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 	role, _ := service.GetAdminUserInfoByID(adminInfo.Org.Id, doctor_id)
 
-	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime)
+	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime, 2)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
 		var randNum int
@@ -219,6 +256,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 			Doctor:             role.UserName,
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
+			PType:              2,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 
@@ -242,6 +280,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 			PrescriptionStatus: info.PrescriptionStatus,
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
+			PType:              info.PType,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 	}
@@ -314,6 +353,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 						BatchNumber:        "",
 						PrescriptionNumber: hpInfo.PrescriptionNumber,
 						PreTime:            pTime,
+						PType:              2,
 					}
 					tempPrescription = prescription
 				} else {
@@ -323,6 +363,8 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					tempPrescription.Doctor = role.UserName
 					tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
+					tempPrescription.PType = 2
+
 				}
 				service.SaveHisPrescription(tempPrescription)
 
@@ -383,6 +425,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)
@@ -397,6 +441,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)
+								}
+							}
+
 						}
 					}
 				}
@@ -425,7 +477,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)
@@ -578,10 +630,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/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/schedule_api_controller.go

@@ -1317,13 +1317,30 @@ func (this *ScheduleApiController) ExportSchedule() {
 		errLogs, _ := service.FindSchedualExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
 		if len(schedules) > 0 {
-			schedule_date := time.Now().Format("2006-01-02")
-			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
-			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
+			//schedule_date := time.Now().Format("2006-01-02")
+			//date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
+			//clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
+			//err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
-					service.CreateSchedule(item)
+					//查找当天日期是否存在
+					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId)
+					if errcode == gorm.ErrRecordNotFound {
+						service.CreateSchedule(item)
+					} else if errcode == nil {
+						schedule := models.XtSchedule{
+							PartitionId:  item.PartitionId,
+							BedId:        item.BedId,
+							PatientId:    item.PatientId,
+							ScheduleDate: item.ScheduleDate,
+							ScheduleType: item.ScheduleType,
+							ScheduleWeek: item.ScheduleWeek,
+							ModeId:       item.ModeId,
+							Status:       1,
+						}
+						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
+					}
+
 				}
 
 				log := models.ExportLog{

controllers/stock_in_api_controller.go

@@ -72,6 +72,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/postgoodinformation", &StockManagerApiController{}, "Post:AddGoodInformation")
 
 	beego.Router("/api/good/postdruginformation", &StockManagerApiController{}, "Post:AddDrugInformation")
+
+	beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -1388,7 +1390,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,
@@ -2076,14 +2078,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		if len(good_kind) != 0 {
 			_, errcodegoodkind := service.IsExistDicConfig(config.ID, good_kind, orgId)
-
+			lastConfig, _ := service.GetLastDicConfig(config.ID, orgId)
 			dataconfig := models.DictDataconfig{
 				ParentId:       config.ID,
 				Module:         "system",
 				OrgId:          orgId,
 				Name:           good_kind,
 				FieldName:      "",
-				Value:          index + 50,
+				Value:          lastConfig.Value + 1,
 				CreatedTime:    "",
 				UpdatedTime:    "",
 				CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2175,13 +2177,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 		if len(medical_insurance_level) != 0 {
 			_, errcodemedicalInsurance := service.IsExistDicConfig(medicalInsuranceDataConfig.ID, medical_insurance_level, orgId)
 			if errcodemedicalInsurance == gorm.ErrRecordNotFound {
+				mediConfigOne, _ := service.GetLastDicConfig(medicalInsuranceDataConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       medicalInsuranceDataConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           medical_insurance_level,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          mediConfigOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2329,7 +2332,8 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		var dealer_id int64
 		dealerName := goodNameM["dealer"].(string)
-		fmt.Println("经销商33333333", dealerName)
+
+		fmt.Println("经销商", dealerName)
 		dealer := models.Dealer{
 			OrgId:      orgId,
 			Status:     1,
@@ -2435,13 +2439,14 @@ func (this *StockManagerApiController) AddGoodInformation() {
 			_, errcodecagegory := service.IsExistDicConfig(drugDataConfig.ID, statistics_category, orgId)
 
 			if errcodecagegory == gorm.ErrRecordNotFound {
+				dicConfigThree, _ := service.GetLastDicConfig(drugDataConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugDataConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           statistics_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          dicConfigThree.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUserInfo.AdminUser.Id,
@@ -2474,23 +2479,23 @@ func (this *StockManagerApiController) AddGoodInformation() {
 	}
 
 	export_time := time.Now().Unix()
-	errLogs, _ := service.FindPatientExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
+	errLogs, _ := service.FindPatientExportLogTwo(this.GetAdminUserInfo().CurrentOrgId, export_time)
 	if len(goods) > 0 {
 
 		for _, item := range goods {
 
 			goodInfo := models.GoodInfo{
-				GoodName:          item.GoodName,
-				SpecificationName: item.SpecificationName,
-				GoodKind:          item.GoodKind,
-				GoodTypeId:        item.GoodTypeId,
-				Dealer:            item.Dealer,
-				GoodUnit:          item.GoodUnit,
-				IsRecord:          item.IsRecord,
-				IsSpecialDiseases: item.IsSpecialDiseases,
-				Manufacturer:      item.Manufacturer,
-				Pinyin:            item.Pinyin,
-
+				GoodName:                    item.GoodName,
+				SpecificationName:           item.SpecificationName,
+				GoodKind:                    item.GoodKind,
+				GoodTypeId:                  item.GoodTypeId,
+				Dealer:                      item.Dealer,
+				GoodUnit:                    item.GoodUnit,
+				IsRecord:                    item.IsRecord,
+				IsSpecialDiseases:           item.IsSpecialDiseases,
+				Manufacturer:                item.Manufacturer,
+				Pinyin:                      item.Pinyin,
+				GoodStatus:                  item.GoodStatus,
 				ProductionType:              item.ProductionType,
 				Remark:                      item.Remark,
 				RetailPrice:                 item.RetailPrice,
@@ -2499,13 +2504,13 @@ func (this *StockManagerApiController) AddGoodInformation() {
 				Wubi:                        item.Wubi,
 				StockWarnCount:              item.StockWarnCount,
 				MedicalInsuranceLevel:       item.MedicalInsuranceLevel,
-				OrgId:                  orgId,
-				Status:                 1,
-				Ctime:                  time.Now().Unix(),
-				StatisticsCategory:     item.StatisticsCategory,
-				GoodCode:               item.GoodCode,
-				BuyPrice:               item.BuyPrice,
-				MedicalInsuranceNumber: item.MedicalInsuranceNumber,
+				OrgId:                       orgId,
+				Status:                      1,
+				Ctime:                       time.Now().Unix(),
+				StatisticsCategory:          item.StatisticsCategory,
+				GoodCode:                    item.GoodCode,
+				BuyPrice:                    item.BuyPrice,
+				MedicalInsuranceNumber:      item.MedicalInsuranceNumber,
 			}
 
 			//查询同种耗材名称同种类型同种规格的耗材是否存在
@@ -2575,6 +2580,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 	total_goods = tempDrugs
 	for index, drugMap := range tempDrugs {
+
 		goodNameM := drugMap.(map[string]interface{})
 		var drug models.BaseDrugLib
 		if goodNameM["drug_name"] == nil || reflect.TypeOf(goodNameM["drug_name"]).String() != "string" {
@@ -2644,16 +2650,19 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drugType = "药品类型"
 
 		drugconfig, _ := service.GetDrugDataConfig(0, drugType)
-		if len(drug_type) == 0 {
-			_, errcodes := service.IsExistDicConfig(drugconfig.ParentId, drug_type, orgId)
+		if len(drug_type) != 0 {
+			_, errcodes := service.IsExistDicConfig(drugconfig.ID, drug_type, orgId)
 			if errcodes == gorm.ErrRecordNotFound {
+				//获取该型号最后一条数据型号
+				config, _ := service.GetLastDicConfig(drugconfig.ID, orgId)
+
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugconfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_type,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          config.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2713,7 +2722,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.DrugOriginPlace = drug_origin_place
 
 		drug_dosage_form := goodNameM["drug_dosage_form"].(string)
-		fmt.Println("药品剂型2222222222", drug_dosage_form)
+
 		if len(drug_dosage_form) == 0 {
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -2734,13 +2743,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drug_dosage_form) != 0 {
 			_, errcodess := service.IsExistDicConfig(drugDosageconfig.ID, drug_dosage_form, orgId)
 			if errcodess == gorm.ErrRecordNotFound {
+				configOne, _ := service.GetLastDicConfig(drugDosageconfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugDosageconfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
-					Name:           drug_dosage,
+					Name:           drug_dosage_form,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          configOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2762,12 +2772,12 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				drug_dosage_form_id = int64(it.Value)
 			}
 		}
-		fmt.Println("hhhhhhh66666666666666", drug_dosage_form_id)
+
 		drug.DrugDosageForm = drug_dosage_form_id
 
 		medical_insurance_level := goodNameM["medical_insurance_level"].(string)
 		var medical_insurance_level_id int64
-		if len(medical_insurance_level) <= 0 { //名字为空则生成一条导入错误日志
+		if len(medical_insurance_level) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2785,13 +2795,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(medical_insurance_level) != 0 {
 			_, errcodemedical := service.IsExistDicConfig(medicalInsuranceConfig.ID, medical_insurance_level, orgId)
 			if errcodemedical == gorm.ErrRecordNotFound {
+				medConfig, _ := service.GetLastDicConfig(medicalInsuranceConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       medicalInsuranceConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           medical_insurance_level,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          medConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2921,17 +2932,18 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drugClassify = "药物分类"
 		var drug_classify_id int64
 		drugClassifyConfig, _ := service.GetDrugDataConfig(0, drugClassify)
-		fmt.Println("9999999999999999999", drugClassifyConfig)
+
 		if len(drug_classify) != 0 {
 			_, errcodesClass := service.IsExistDicConfig(drugClassifyConfig.ID, drug_classify, orgId)
 			if errcodesClass == gorm.ErrRecordNotFound {
+				drugClassConfig, _ := service.GetLastDicConfig(drugClassifyConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugClassifyConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_classify,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugClassConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -2996,17 +3008,20 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Manufacturer = manufacturer_id
 
 		dealer := goodNameM["dealer"].(string)
-		_, errcodesdealer := service.GetDealerByName(orgId, dealer)
-		if errcodesdealer == gorm.ErrRecordNotFound {
-			dealerconfig := models.Dealer{
-				DealerName: dealer,
-				Status:     1,
-				OrgId:      orgId,
-				Ctime:      time.Now().Unix(),
-				Creater:    adminUser.AdminUser.Id,
+		if len(dealer) != 0 {
+			_, errcodesdealer := service.GetDealerByName(orgId, dealer)
+			if errcodesdealer == gorm.ErrRecordNotFound {
+				dealerconfig := models.Dealer{
+					DealerName: dealer,
+					Status:     1,
+					OrgId:      orgId,
+					Ctime:      time.Now().Unix(),
+					Creater:    adminUser.AdminUser.Id,
+				}
+				service.CreateDealer(&dealerconfig)
 			}
-			service.CreateDealer(&dealerconfig)
 		}
+
 		var dealer_id int64
 		dealerList, _ := service.GetAllDealerList(orgId)
 		for _, it := range dealerList {
@@ -3034,14 +3049,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(statistics_category) != 0 {
 			_, errcodestatistc := service.IsExistDicConfig(statistcConfig.ID, statistics_category, orgId)
 			if errcodestatistc == gorm.ErrRecordNotFound {
-
+				staConfig, _ := service.GetLastDicConfig(statistcConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       statistcConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           statistics_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          staConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3081,13 +3096,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(pharmacology_category) != 0 {
 			_, errcodespharmacology := service.IsExistDicConfig(pharmacologyConfig.ID, pharmacology_category, orgId)
 			if errcodespharmacology == gorm.ErrRecordNotFound {
+				dicConfig, _ := service.GetLastDicConfig(pharmacologyConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       pharmacologyConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           pharmacology_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          dicConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3147,13 +3163,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drug_control) != 0 {
 			_, errcodesdrugcontrol := service.IsExistDicConfig(drugContorlConfig.ID, drug_control, orgId)
 			if errcodesdrugcontrol == gorm.ErrRecordNotFound {
+				drugContorlConfigOne, _ := service.GetLastDicConfig(drugContorlConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugContorlConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_control,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugContorlConfigOne.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3183,17 +3200,18 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		var drug_category_id int64
 
 		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
-		fmt.Println("33333drugCategoryConfig", drugCategoryConfig)
+
 		if len(drug_category) != 0 {
 			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
 			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
+				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
 				dataconfig := models.DictDataconfig{
 					ParentId:       drugCategoryConfig.ID,
 					Module:         "system",
 					OrgId:          orgId,
 					Name:           drug_category,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          drugCategoryConfigSix.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3259,13 +3277,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		if len(drugDoseUnit) != 0 {
 			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
 			if errcodedataconfig == gorm.ErrRecordNotFound {
+				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
 				dataconfig := models.Dataconfig{
 					ParentId:       dataConfig.ID,
 					Module:         "hemodialysis",
 					OrgId:          orgId,
 					Name:           drugDoseUnit,
 					FieldName:      "",
-					Value:          index + 50,
+					Value:          childConfig.Value + 1,
 					CreatedTime:    "",
 					UpdatedTime:    "",
 					CreateUserId:   adminUser.AdminUser.Id,
@@ -3296,8 +3315,8 @@ func (this *StockManagerApiController) AddDrugInformation() {
 	}
 
 	export_time := time.Now().Unix()
-	errLogs, _ := service.FindPatientExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
-	fmt.Println("数组", drugList)
+	errLogs, _ := service.FindPatientExportLogOne(this.GetAdminUserInfo().CurrentOrgId, export_time)
+
 	if len(drugList) > 0 {
 		for _, item := range drugList {
 
@@ -3395,3 +3414,64 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		})
 	}
 }
+
+func (this *StockManagerApiController) GetInitializtion() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var drugCategory = "药品类别"
+	var drugType = "药品类型"
+	var drugDosageForm = "药品剂型"
+	var medicalInsuranceLevel = "医保等级"
+	var drugControl = "开药控制"
+	var drugClassify = "药物分类"
+	var statisticsCategory = "统计分类"
+	var pharmacologyCategory = "药理分类"
+	var goodKind = "耗材种类"
+	var tubeColor = "试管颜色"
+	var costClassify = "费用类别"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	drugCategoryParent, _ := service.GetDrugDataConfig(0, drugCategory)
+	drugCategoryList, _ := service.GetParentDataConfig(drugCategoryParent.ID, orgId)
+
+	drugDosageFormParent, _ := service.GetDrugDataConfig(0, drugDosageForm)
+	drugDosageFormList, _ := service.GetParentDataConfig(drugDosageFormParent.ID, orgId)
+
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
+
+	drugControlParent, _ := service.GetDrugDataConfig(0, drugControl)
+	drugControlList, _ := service.GetParentDataConfig(drugControlParent.ID, orgId)
+
+	drugClassifyParent, _ := service.GetDrugDataConfig(0, drugClassify)
+	drugClassifyList, _ := service.GetParentDataConfig(drugClassifyParent.ID, orgId)
+
+	statisticsCategoryParent, _ := service.GetDrugDataConfig(0, statisticsCategory)
+	statisticsCategoryList, _ := service.GetParentDataConfig(statisticsCategoryParent.ID, orgId)
+
+	pharmacologyCategoryParent, _ := service.GetDrugDataConfig(0, pharmacologyCategory)
+	pharmacologyCategoryList, _ := service.GetParentDataConfig(pharmacologyCategoryParent.ID, orgId)
+
+	goodKindParent, _ := service.GetDrugDataConfig(0, goodKind)
+	goodKindList, _ := service.GetParentDataConfig(goodKindParent.ID, orgId)
+
+	tubeColorParent, _ := service.GetDrugDataConfig(0, tubeColor)
+	tubeColorList, _ := service.GetParentDataConfig(tubeColorParent.ID, orgId)
+
+	costClassifyParent, _ := service.GetDrugDataConfig(0, costClassify)
+	costClassifyList, _ := service.GetParentDataConfig(costClassifyParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugCategoryList":          drugCategoryList,
+		"drugTypeList":              drugTypeList,
+		"drugDosageFormList":        drugDosageFormList,
+		"medicalInsuranceLevelList": medicalInsuranceLevelList,
+		"drugControlList":           drugControlList,
+		"drugClassifyList":          drugClassifyList,
+		"statisticsCategoryList":    statisticsCategoryList,
+		"pharmacologyCategoryList":  pharmacologyCategoryList,
+		"goodKindList":              goodKindList,
+		"tubeColorList":             tubeColorList,
+		"costClassifyList":          costClassifyList,
+	})
+}

models/dialysis.go

@@ -585,6 +585,7 @@ type AssessmentAfterDislysis struct {
 	SupineDiastolicBloodPressure    string  `gorm:"column:supine_diastolic_blood_pressure" json:"supine_diastolic_blood_pressure" form:"supine_diastolic_blood_pressure"`
 	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
 	OtherComplication               string  `gorm:"column:other_complication" json:"other_complication" form:"other_complication"`
+	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/drug.go

@@ -16,9 +16,13 @@ type BaseDrugLib struct {
 	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"`
@@ -56,10 +60,15 @@ 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"`
+	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"`
 }
 
 func (BaseDrugLib) TableName() string {

models/drug_stock.go

@@ -215,3 +215,13 @@ type DrugAutomaticReduceDetail struct {
 func (DrugAutomaticReduceDetail) TableName() string {
 	return "xt_drug_automatic_reduce_detail"
 }
+
+type VmDrugAutomaticReduceDetail struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Total                   int64
+}

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

@@ -2,6 +2,7 @@ package models
 
 import (
 	//"gdyb/models"
+
 	"time"
 )
 
@@ -242,22 +243,74 @@ 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"`
-	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"`
+	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"`
 }
 
 func (Drug) TableName() string {
@@ -331,6 +384,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 {
@@ -359,9 +413,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 {
@@ -478,16 +534,74 @@ 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"`
-	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"`
+	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"`
 }
 
 func (VMDrug) TableName() string {
@@ -547,8 +661,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 {
@@ -585,13 +711,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 {
@@ -712,6 +842,10 @@ 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"`
 
@@ -719,10 +853,14 @@ type HisOrder struct {
 	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:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" 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 {
@@ -881,6 +1019,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"`
@@ -1021,3 +1172,145 @@ 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"`
+}
+
+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"
+}

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
 }
 
@@ -1093,12 +1093,18 @@ func UpdateDialysisBeforePrepare(info *models.DialysisBeforePrepare) (err error)
 
 func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err error) {
 	err = writeDb.Model(&models.DialysisBeforePrepare{}).
-		Where("status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
-		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier, "commdity_code": info.CommdityCode}).Error
+		Where("status = 1 and good_id = ? AND good_type_id = ? AND patient_id = ? AND user_org_id = ? AND record_date = ?", info.GoodId, info.GoodTypeId, info.PatientId, info.UserOrgId, info.RecordDate).
+		Updates(map[string]interface{}{"count": info.Count, "updated_time": time.Now().Unix(), "modifier": info.Modifier, "commdity_code": info.CommdityCode, "status": 1}).Error
 
 	return err
 }
 
+func UpdateAutoReduceDetailSix(detail *models.AutomaticReduceDetail) (err error) {
+
+	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
+	return err
+}
+
 func UpdateOrderCountSub(good_type_id int64, good_id int64, number string, org_id int64, count int64) {
 	writeDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, number).UpdateColumn("count", gorm.Expr("count - ?", count))
 
@@ -1110,7 +1116,7 @@ func UpdateOrderCountAdd(good_type_id int64, good_id int64, number string, org_i
 }
 
 func UpdateUserInfoDetails(good_type_id int64, good_id int64, time int64, org_id int64, patient_id int64, count int64, out *models.WarehouseOutInfo) {
-	writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count})
+	writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count, "status": 1})
 	//writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber).UpdateColumn("count", count)
 
 }
@@ -1173,3 +1179,35 @@ func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error
 	err := XTReadDB().Create(&prepare).Error
 	return err
 }
+
+func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (err error) {
+
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	err = ut.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1   AND parent_id IN (?) AND execution_state = 1 ", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	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/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 = ? AND his_order.order_status > 1 ", 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).
@@ -459,3 +475,17 @@ func GetMonitorConfigById(orgid int64) (*models.XtMonitorConfig, error) {
 	}
 	return &config, nil
 }
+
+func GetDrugAutoMaticList(orgid int64, warehouse_out_id int64, record_time int64, warehouse_out_order_number string) (auto []*models.VmDrugAutomaticReduceDetail, err error) {
+
+	db := XTReadDB().Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
+	err = db.Select("x.org_id,x.warehouse_out_id,x.record_time,x.drug_id,sum(x.count) as total").Where("x.org_id = ?  and x.record_time = ? and x.status= 1 and x.warehouse_out_order_number = ?", orgid, record_time, warehouse_out_order_number).Group("x.drug_id").Scan(&auto).Error
+	return auto, err
+
+}
+
+func GetAllBaseDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
+	return drug, err
+}

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

@@ -47,7 +47,7 @@ func GetHisProjectList(orgid int64, limit int64, page int64, charge int64, start
 	if isMark > 0 {
 		db = db.Where("x.is_mark = ?", isMark)
 	}
-	err = db.Select("x.id,x.project_name,x.pinyin,x.wubi,x.price,x.unit,x.cost_classify,x.executive_section,x.medical_coverage,x.statistical_classification,x.disease_directory,x.is_record,x.medical_code,x.tube_color,x.medical_status,x.remark,x.sign,x.default_number,x.is_default,x.is_charge,x.is_estimate,x.is_workload,x.sort,x.doctor_advice,x.user_org_id,x.status,x.created_time,x.is_mark").Count(&total).Offset(offset).Limit(limit).Find(&hisproject).Error
+	err = db.Select("x.id,x.project_name,x.pinyin,x.wubi,x.price,x.unit,x.cost_classify,x.executive_section,x.medical_coverage,x.statistical_classification,x.disease_directory,x.is_record,x.medical_code,x.tube_color,x.medical_status,x.remark,x.sign,x.default_number,x.is_default,x.is_charge,x.is_estimate,x.is_workload,x.sort,x.doctor_advice,x.user_org_id,x.status,x.created_time,x.is_mark").Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&hisproject).Error
 	return hisproject, total, err
 }
 
@@ -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
@@ -264,6 +264,8 @@ func CreateHisPatient(patient *models.XtHisPatient) error {
 
 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
 }
 
@@ -287,8 +289,8 @@ 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
 }
 
@@ -396,7 +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", "status = 1 and user_org_id = ?", orgid).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
 }
@@ -540,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
 }
 
@@ -590,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
 }
 
@@ -697,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/his_service.go

@@ -35,6 +35,7 @@ type HisPatient struct {
 	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"prescription"`
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	VMHisOrders     []*VMHisOrder      `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"orders"`
 	VMHisOrder      VMHisOrder         `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"order"`
 }
 
@@ -106,6 +107,9 @@ type VMHisOrder struct {
 	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 (VMHisOrder) TableName() string {
@@ -154,8 +158,8 @@ func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64,
 	}
 
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
 	return
 }
 
@@ -189,8 +193,8 @@ func GetHisPatientList(org_id int64, keywords string, record_date int64) (patien
 	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
 		Joins("join his_patient as hp ON hp.patient_id = xt_patients.id AND hp.record_date = ? AND hp.status = 1 AND hp.user_org_id = ?", record_date, org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?  AND p_type <> 1", org_id, record_date).Find(&patients).Error
 	return
 }
 
@@ -261,8 +265,8 @@ func GetNewHisPatientList(org_id int64, record_date int64) (patients []*PatientT
 	return
 }
 
-func GetNewScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+func GetNewScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*PatientTwo, err error) {
+	db := readDb.Model(&PatientTwo{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 
 	if sch_type != 0 {
 		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
@@ -271,7 +275,6 @@ func GetNewScheduleHisPatientList(org_id int64, keywords string, record_date int
 	}
 
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
 	return
 }
@@ -301,6 +304,11 @@ func GetNewHisPatientInfoTwo(org_id int64, id int64, record_date int64) (info mo
 	return
 }
 
+func GetHisPatientCount(org_id int64, patient_id int64, record_date int64) (total int64, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Count(&total).Error
+	return
+}
+
 func GetXTPatientInfo(org_id int64, patient_id int64) (info models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1  AND id = ?", org_id, patient_id).First(&info).Error
 	return
@@ -392,7 +400,7 @@ func DelelteProject(id int64, user_org_id int64) (err error) {
 	return
 }
 
-func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetHisPrescription(org_id int64, patient_id int64, record_date int64, p_type 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")
@@ -401,14 +409,14 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 			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", "status=1")
+			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 = ?  ", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ?", org_id, record_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetNewHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetNewHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64, p_type 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")
@@ -417,14 +425,14 @@ func GetNewHisPrescription(org_id int64, patient_id int64, his_patient_id int64,
 			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", "status=1")
+			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 his_patient_id = ? ", org_id, record_date, patient_id, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND his_patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, his_patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64, p_type 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")
@@ -433,14 +441,14 @@ func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id
 			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", "status=1")
+			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 his_patient_id = ?", org_id, record_date, patient_id, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 AND his_patient_id = ? AND p_type = ?", org_id, record_date, patient_id, his_patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date int64, p_type 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")
@@ -449,9 +457,9 @@ func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_
 			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", "status=1")
+			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 his_patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND his_patient_id = ? AND order_status <> 2 AND order_status <> 3 AND p_type = ?", org_id, record_date, patient_id, his_patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
@@ -465,9 +473,9 @@ func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int
 			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", "status=1")
+			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 his_patient_id = ?", org_id, record_date, patient_id, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1", org_id, record_date, patient_id, his_patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -481,14 +489,14 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, e
 			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", "status=1")
+			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 record_date <= ? AND patient_id = ? AND order_status <> 2 ", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, start_date, end_date, patient_id).
 		Find(&prescription).Error
 	return
 }
 
-func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64, end_date int64, p_type 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")
@@ -497,14 +505,14 @@ func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64
 			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", "status=1")
+			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 record_date <= ? AND patient_id = ?", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64, p_type 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")
@@ -513,15 +521,15 @@ func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int
 			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", "status=1")
+			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 record_date <= ? AND patient_id = ?  ", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? ", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
 //未收费
-func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64, p_type 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")
@@ -530,15 +538,15 @@ func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_
 			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", "status=1")
+			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 record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3 ", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3  AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
 //已收费
-func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_date int64, p_type 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")
@@ -547,9 +555,9 @@ func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_dat
 			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", "status=1")
+			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 record_date <= ? AND patient_id = ? AND order_status = 2", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status = 2 AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
@@ -603,58 +611,75 @@ func (VMDrugCancelStockInfo) TableName() string {
 }
 
 type BaseDrugLib struct {
-	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"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_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"`
-	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"`
-	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"`
+	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"`
+
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
@@ -701,7 +726,7 @@ func FindAllHisAdviceTemplate(org_id int64) (temps []*models.HisDoctorAdvicePare
 func GetHisAdminUserDoctors(org_id int64) (doctors []*models.UserAdminRole, err error) {
 	err = readUserDb.Model(&models.UserAdminRole{}).Preload("XtHisDepartment", func(db *gorm.DB) *gorm.DB {
 		return readDb.Model(&models.XtHisDepartment{}).Where("status = 1 AND user_org_id = ?", org_id)
-	}).Where("org_id = ? AND status = 1 AND (user_type = 1 OR user_type = 2)", org_id).Find(&doctors).Error
+	}).Where("org_id = ? AND status = 1 AND user_type = 2", org_id).Find(&doctors).Error
 	return
 }
 
@@ -740,8 +765,14 @@ func CreateOrderInfo(order *models.HisOrderInfo) (err error) {
 	return
 }
 
-func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
+func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
+	return
+
+}
+
+func FindHisPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64, p_type int64, his_patient_id int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? AND his_patient_id = ? ", org_id, record_date, patient_id, p_type, his_patient_id).First(&info).Error
 	return
 
 }
@@ -757,7 +788,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string, p_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -778,12 +809,13 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 		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.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).
-		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id)
-
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisHospitalCheckRecord", "status = 1 AND user_org_id = ?", user_org_id)
+	db = db.Preload("HisFundSettleListResult", "status = 1")
 	db = db.Count(&total)
 	err = db.Limit(limit).Offset(offset).Order("setl_time desc,ctime").Find(&order).Error
 	return
@@ -805,6 +837,12 @@ func UpDatePrescriptionInfoNumber(user_org_id int64, id int64, number string, re
 	return
 }
 
+func UpDateHisPrescriptionInfoNumber(user_org_id int64, id int64, number string, record_time int64, his_patient_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND his_patient_id = ? AND record_date = ?", user_org_id, his_patient_id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 3, "mtime": time.Now().Unix()}).Error
+
+	return
+}
+
 type HisOrder 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"`
@@ -832,6 +870,9 @@ type HisOrder struct {
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
+
+	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 (HisOrder) TableName() string {
@@ -853,7 +894,7 @@ func GetHisPrescriptionThree(org_id int64, patient_id int64, number string) (pre
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
 		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
 		Where("user_org_id = ? AND status = 1  AND patient_id = ? AND batch_number=?", org_id, patient_id, number).
@@ -903,7 +944,7 @@ func GetHisPrescriptionOrderList(org_id int64) (prescriptionOrder []*HisPrescrip
 }
 
 func GetHisPrescriptionOrderInfo(id int64, org_id int64) (prescriptionOrder HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND id = ? AND user_org_id = ? ", id, org_id).
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPatientCaseHistory", "status = 1 AND user_org_id = ?", org_id).First(&prescriptionOrder).Error
@@ -915,7 +956,7 @@ func GetHisPrescriptionFour(org_id int64, patient_id int64, record_date int64, n
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+			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 prescription_number=?", org_id, record_date, patient_id, number).
 		Find(&prescription).Error
@@ -929,7 +970,7 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 }
 
 func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 
@@ -1019,6 +1060,9 @@ type XtHisOrder struct {
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
+
+	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 (XtHisOrder) TableName() string {
@@ -1029,7 +1073,7 @@ func GetHisPrescriptionNight(org_id int64, patient_id int64, record_date int64,
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? and prescription_id =?", org_id, prescription_id).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
 		}).
 		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
@@ -1048,18 +1092,32 @@ func DelelteAddition(id int64, user_org_id int64) (err error) {
 	return
 }
 
+func GetNewHisPatientPrescriptionList(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
+}
+
 func GetHisPatientPrescriptionList(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(&VMSchedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
 	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 ?", org_id, record_date, 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", org_id).
-		Preload("VMHisPrescriptionInfo", "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
@@ -1106,39 +1164,54 @@ func (VMHisPrescription) TableName() string {
 	return "his_prescription"
 }
 
-func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64, patient_id int64, p_type int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
 	if change_type == 1 { //根据日期取出上一方数据
 		var Id AdviceDate
-		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
-		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ? AND p_type = ?", patient_id, org_id, record_time, p_type).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ? AND p_type = ?", patient_id, org_id, Id.RecordDate, p_type).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
 					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", "status=1")
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
 					})
 			}).Find(&advice).Error
 
 	} else if change_type == 2 {
 		var Id AdviceDate
-		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date > ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date desc").Scan(&Id).Error
-		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date > ? AND p_type = ?", patient_id, org_id, record_time, p_type).Select("record_date").Group("record_date").Order("record_date desc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ? AND p_type = ?", patient_id, org_id, Id.RecordDate, p_type).
 			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 				return db.Where("status = 1 AND user_org_id = ?", org_id).
 					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", "status=1")
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
 					})
 			}).Find(&advice).Error
 	}
 	return
 }
 
-func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, patient_id int64, p_type int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ? AND p_type = ?", patient_id, org_id, start_time, end_time, p_type).
+		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).
+				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")
+				})
+		}).Find(&advice).Error
+
+	return
+}
+
+func GetMobileCallHisPrescriptions(start_time int64, end_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
 	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ?", patient_id, org_id, start_time, end_time).
 		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).
@@ -1146,7 +1219,7 @@ func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, pat
 					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", "status=1")
+					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
 				})
 		}).Find(&advice).Error
 
@@ -1227,20 +1300,21 @@ func GetHisPrescriptionByPatientID(patientID int64, orgID int64) (info models.Hi
 }
 
 type VMHisProjectTeam struct {
-	ID           int64           `gorm:"column:id" json:"id" form:"id"`
-	ProjectTeam  string          `gorm:"column:project_team" json:"project_team" form:"project_team"`
-	Price        float64         `gorm:"column:price" json:"price" form:"price"`
-	Pinyin       string          `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi         string          `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	TubeColor    int64           `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
-	TeamType     int64           `gorm:"column:team_type" json:"team_type" form:"team_type"`
-	Remark       string          `gorm:"column:remark" json:"remark" form:"remark"`
-	UserOrgId    int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status       int64           `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	ProjectId    string          `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	VMHisProject []*VMHisProject `gorm:"-" json:"project" form:"project"`
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam       string               `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price             float64              `gorm:"column:price" json:"price" form:"price"`
+	Pinyin            string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi              string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor         int64                `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType          int64                `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark            string               `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId         int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime       int64                `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime       int64                `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ProjectId         string               `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	VMItemProjectList []*VMItemProjectList `gorm:"-" json:"list" form:"list"`
+	ItemId            string               `gorm:"column:item_id" json:"item_id" form:"item_id"`
 }
 
 func (VMHisProjectTeam) TableName() string {
@@ -1267,6 +1341,24 @@ func (VMHisProject) TableName() string {
 	return "xt_his_project"
 }
 
+type VMItemProjectList 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"`
+	TeamId       int64        `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	Type         int64        `gorm:"column:type" json:"type" form:"type"`
+	VMHisProject VMHisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	GoodInfo     GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+}
+
+func (VMItemProjectList) TableName() string {
+	return "xt_his_project_list"
+}
+
 type VMHisPrescriptionTwo 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"`
@@ -1284,10 +1376,10 @@ func (VMHisPrescriptionTwo) TableName() string {
 func GetAllProjectTeamList(orgid int64) (project []*VMHisProjectTeam, err error) {
 	err = XTReadDB().Model(&VMHisProjectTeam{}).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
 	for _, item := range project {
-		var project_item []*VMHisProject
-		ids := strings.Split(item.ProjectId, ",")
-		XTReadDB().Model(&VMHisProject{}).Where("status = 1 AND id IN (?)", ids).Find(&project_item)
-		item.VMHisProject = append(item.VMHisProject, project_item...)
+		var project_item []*VMItemProjectList
+		ids := strings.Split(item.ItemId, ",")
+		XTReadDB().Model(&VMItemProjectList{}).Where("status = 1 AND id IN (?)", ids).Preload("VMHisProject", "status = 1 AND user_org_id = ?", orgid).Preload("GoodInfo", "status = 1 AND org_id = ?", orgid).Find(&project_item)
+		item.VMItemProjectList = append(item.VMItemProjectList, project_item...)
 	}
 	return
 }
@@ -1323,28 +1415,40 @@ func (HisDoctorAdviceInfo) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID                   int64                `gorm:"column:id" json:"id" form:"id"`
-	ProjectId            int64                `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price                float64              `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId            int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status               int64                `gorm:"column:status" json:"status" form:"status"`
-	Ctime                int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId            int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId         int64                `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate           int64                `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId       int64                `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	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"`
-	VMHisProject         VMHisProject         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	ID                 int64        `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64      `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64        `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	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"`
+	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	VMGoodInfo         VMGoodInfo   `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"`
 	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
+	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 {
@@ -1378,7 +1482,7 @@ func (HisOrderInfo) TableName() string {
 
 func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisOrderInfo, err error) {
 	err = readDb.Model(&HisOrderInfo{}).Where("order_number = ? AND status = 1", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id)
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
 	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
 	}).Find(&order).Error
@@ -1531,7 +1635,7 @@ func GetNewHisOrder(user_org_id int64, mdtrt_id string, patient_id int64) (order
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("HisPrescriptionInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Order("ctime desc").
-		Find(&order).Error
+		Last(&order).Error
 	return
 }
 
@@ -1601,10 +1705,20 @@ func (NewTempPatients) TableName() string {
 func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date int64) (patients []*NewTempPatients, err error) {
 	db := readDb.Model(&NewTempPatients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrder", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
+		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
 	})
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Error
+
+	for _, item := range patients {
+		for _, sumItem := range item.HisPatient {
+			if len(sumItem.VMHisOrders) > 0 {
+				sumItem.VMHisOrder.OrderStatus = sumItem.VMHisOrders[len(sumItem.VMHisOrders)-1].OrderStatus
+			}
+		}
+
+	}
+
 	return
 }
 
@@ -1628,6 +1742,9 @@ type CustomInComeStatistics struct {
 	DiscountPrice      float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
 	PreferentialPrice  float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
 	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+
+	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 (CustomInComeStatistics) TableName() string {
@@ -1667,3 +1784,77 @@ func GetDayIncomeDetailStatisticsData(org_id int64, keywords string, start_time
 	}
 	return
 }
+
+//func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+//	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+//	return
+//}
+
+func CreateHisPrescriptionTemplate(template *models.HisPrescriptionTemplate) (err error) {
+	err = writeDb.Create(&template).Error
+	return
+
+}
+
+func CreateHisPrescriptionAdviceTemplate(s *models.HisPrescriptionAdviceTemplate) (err error) {
+	err = writeDb.Save(&s).Error
+	return
+}
+
+func CreateHisPrescriptionInfoTemplate(s *models.HisPrescriptionInfoTemplate) (err error) {
+	err = writeDb.Save(&s).Error
+	return
+}
+
+func CreateHisPrescriptionProjectTemplate(project *models.HisPrescriptionProjectTemplate) (err error) {
+	err = writeDb.Save(&project).Error
+	return
+}
+
+func GetPatientSch(patient_id int64, sch_date int64, org_id int64) (sch models.Schedule, err error) {
+	err = readDb.Model(&models.Schedule{}).Where("user_org_id = ? AND patient_id = ? AND schedule_date = ? AND status = 1", org_id, patient_id, sch_date).First(&sch).Error
+	return
+}
+
+func GetHisPrescriptionBySchMode(mode_id int64, patient_id int64, org_id int64) (prescription models.HisPrescriptionTemplate, err error) {
+	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND status = 1 AND mode = ? AND patient_id = ?", org_id, mode_id, patient_id).Last(&prescription).Error
+	return
+}
+
+func GetHisPrescriptionTemplate(template_id int64, org_id int64) (prescription []*models.HisPrescriptionInfoTemplate, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfoTemplate{}).
+		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id)
+		}).
+		Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("status = 1 AND p_template_id = ? ", template_id).
+		Find(&prescription).Error
+	return
+}
+
+func FindHisConsumablesByID(orgID int64, patient_id int64, recordDate int64, good_id int64) (consumables models.DialysisBeforePrepare, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 AND good_id = ?", orgID, patient_id, recordDate, good_id).First(&consumables).Error
+	return
+}
+
+func UpdateConsumables(consumables *models.DialysisBeforePrepare) (err error) {
+	err = writeDb.Save(&consumables).Error
+	return
+}
+
+func GetHisPrescriptionProjectsByID(id int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status = 1").Where("prescription_id = ? AND status = 1", id).Find(&projects).Error
+	return
+}
+
+func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1", user_org_id, patient_id, record_time).Find(&projects).Error
+	return
+}
+
+func GetHisPrescriptionProjectByID(id int64) (projects models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
+	return
+}

service/mobile_dialysis_service.go

@@ -1457,6 +1457,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 {
@@ -2056,3 +2058,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/patient_service.go

@@ -1394,6 +1394,21 @@ func FindPatientExportLog(org_id int64, export_time int64) (errLogs []*models.Ex
 	return
 }
 
+func FindPatientExportLogOne(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 4", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
+func FindPatientExportLogTwo(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 5", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
+func FindPatientExportLogThree(org_id int64, export_time int64) (errLogs []*models.ExportErrLog, err error) {
+	err = readDb.Model(&models.ExportErrLog{}).Where("user_org_id = ? AND export_time = ? AND log_type = 6", org_id, export_time).Find(&errLogs).Error
+	return
+}
+
 func CreateExportLog(log *models.ExportLog) {
 	writeDb.Create(&log)
 }
@@ -1481,6 +1496,6 @@ func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription
 }
 
 func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string, template_id string, fre_type int64, patient_id int64, record_date int64) (advice models.DoctorAdvice, err error) {
-	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
+	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? AND advice_type = 2 ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
 	return
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -524,21 +524,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/schedule_service.go

@@ -133,6 +133,24 @@ func CreateSchedule(m *models.Schedule) error {
 	return writeDb.Model(&models.Schedule{}).Create(&m).Error
 }
 
+func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*models.XtSchedule, error) {
+	var scheudle models.XtSchedule
+	var err error
+	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, schedudate, orgid).Find(&scheudle).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &scheudle, nil
+}
+
+func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
 func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 	var schedule models.Schedule
 	var err error

service/self_drug_service.go

@@ -500,7 +500,7 @@ func CreateAotoMaticReduceDetail(detail *models.XtDrugAutomaticReduceDetail) err
 func GetDrugStockConfig(orgid int64) (models.XtDrugStockConfig, error) {
 
 	config := models.XtDrugStockConfig{}
-	err := XTReadDB().Model(&config).Where("org_id =? and status = 1", orgid).Find(&orgid).Error
+	err := XTReadDB().Model(&config).Where("org_id =? and status = 1", orgid).Find(&config).Error
 	return config, err
 }
 

service/stock_service.go

@@ -971,6 +971,7 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 		likeKey := "%" + keywords + "%"
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_drug_warehouse_out.creater")
 		db = db.Joins("join xt_manufacturer on xt_manufacturer.id = xt_drug_warehouse_out.manufacturer")
+
 		db = db.Where("xt_manufacturer.manufacturer_name LIKE ? OR sgj_user_admin_role.user_name LIKE ? OR xt_drug_warehouse_out.warehouse_out_order_number LIKE ?", likeKey, likeKey, likeKey).Group("xt_drug_warehouse_out.id")
 	}
 
@@ -2112,7 +2113,7 @@ func UpdateDrugStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
 
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ?AND status = 1  AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
 	return
 
 }
@@ -2139,10 +2140,13 @@ func (VMWarehousingInfo) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                int64  `gorm:"column:id" json:"id"`
-	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
-	Status            int64  `gorm:"column:status" json:"status"`
-	OrgId             int64  `gorm:"column:org_id" json:"org_id"`
+	ID                int64   `gorm:"column:id" json:"id"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name"`
+	Status            int64   `gorm:"column:status" json:"status"`
+	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"`
+	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 }
 
 func (GoodInfo) TableName() string {
@@ -2291,7 +2295,7 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
-	err = XTReadDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and status =1", drugname, drugdesc).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and status =1 and org_id = ?", drugname, drugdesc, orgid).Find(&drug).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2410,6 +2414,13 @@ func IsExistDicConfig(parentid int64, goodKind string, orgid int64) (*models.Dic
 	return &dataconfig, nil
 }
 
+func GetLastDicConfig(parentid int64, orgid int64) (models.DictDataconfig, error) {
+
+	dataconfig := models.DictDataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("parent_id = ? and (org_id = ? or org_id = 0) and status = 1", parentid, orgid).Last(&dataconfig).Error
+	return dataconfig, err
+}
+
 func CreatedDicConfig(dataconfig *models.DictDataconfig) error {
 
 	err := XTWriteDB().Create(&dataconfig).Error
@@ -2482,6 +2493,13 @@ func GetChildeConfigIsExist(parentid int64, name string, orgid int64) (*models.D
 	return &dataconfig, nil
 }
 
+func GetLastChildeConfig(parentid int64, orgid int64) (models.Dataconfig, error) {
+
+	dataconfig := models.Dataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("parent_id = ? and (org_id = ? or org_id = 0) and status =1", parentid, orgid).Last(&dataconfig).Error
+	return dataconfig, err
+}
+
 func CreateDataConfig(dataconfig *models.Dataconfig) error {
 
 	err := XTWriteDB().Create(&dataconfig).Error