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

controllers/his_api_controller.go

 
 	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
 
+	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
+
 }
 
 func (c *HisApiController) Sscard() {
 	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(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)
+	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 		"schedule":            sch,
 		"count":               count,
 		"drugStockConfig":     drugStockConfig,
+		"last_info":           lastPatientPrescriptionInfo,
 	})
 	return
 
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose, _ := c.GetInt64("diagnose")
+	diagnose := c.GetString("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose, _ := c.GetInt64("diagnose", 0)
+	//diagnose, _ := c.GetInt64("diagnose", 0)
+	diagnose := c.GetString("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
 
-	diagnosis_id, _ := c.GetInt64("diagnosis")
+	//diagnosis_id, _ := c.GetInt64("diagnosis")
+
+	diagnosis_ids := c.GetString("diagnosis")
+
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type := c.GetString("p_type")
 
 			Departments:            department,
 			Doctor:                 doctor,
 			PType:                  reg_type,
-			Diagnosis:              diagnosis_id,
+			Diagnosis:              diagnosis_ids,
 			SickType:               sick_type,
 		}
 		service.CreateHisPatient(&hisPatient)
 			Departments:            department,
 			Doctor:                 doctor,
 			PType:                  reg_type,
-			Diagnosis:              diagnosis_id,
+			Diagnosis:              diagnosis_ids,
 			SickType:               sick_type,
 		}
 		service.CreateHisPatient(&hisPatient)
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
 
-	diagnosis_id, _ := c.GetInt64("diagnosis")
+	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 	order_id, _ := c.GetInt64("order_id")
 			SettleType:            settle_accounts_type,
 			FaPiaoCode:            fapiao_code,
 			FaPiaoNumber:          fapiao_number,
+			Diagnosis:             diagnosis_id,
 			PType:                 2,
 		}
 		err = service.CreateOrder(order)
 			tempOrder.FaPiaoNumber = fapiao_number
 			tempOrder.PType = 2
 			tempOrder.MedfeeSumamt = totals
+			tempOrder.Diagnosis = diagnosis_id
 
 			err = service.SaveHisOrder(&tempOrder)
 			err = service.UpdataOrderStatusTwo(tempOrder.Number, adminUser.CurrentOrgId)
 	}
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+
+	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 		"prescription":        prescriptions,
 		"case_history":        case_history,
 		"info":                patientPrescriptionInfo,
+		"last_info":           lastPatientPrescriptionInfo,
 		"month_prescriptions": monthPrescriptions,
 		"order":               order,
 		"doctors":             doctors,
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
-	diagnosis_id, _ := c.GetInt64("diagnosis")
+	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
 		PType:              2,
 		IsPre:              1,
 		MedType:            strconv.Itoa(int(reg_type)),
+		Diagnosis:          diagnosis_id,
 	}
 	err = service.CreateOrder(order)
 	if err != nil {
 		}
 		service.CreateOrderInfo(info)
 	}
-	his.Diagnosis = diagnosis_id
 	his.SickType = sick_type
 	service.UpdataHisPateint(&his)
 	err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 	})
 
 }
+
+func (this *HisApiController) ChangeMedType() {
+	med_type := this.GetString("med_type")
+	id, _ := this.GetInt64("id")
+
+	prescription, _ := service.GetPrescriptionById(id, this.GetAdminUserInfo().CurrentOrgId)
+	prescription.MedType = med_type
+	err := service.SaveHisPrescription(&prescription)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+
+	} else {
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}

controllers/his_project_api_controller.go

 	social_type, _ := this.GetInt64("social_type")
 	id_card_type, _ := this.GetInt64("id_card_type")
 
-	diagnosis_id, _ := this.GetInt64("diagnosis")
+	//diagnosis_id, _ := this.GetInt64("diagnosis")
+
+	diagnosis_ids := this.GetString("diagnosis")
+
 	sick_type, _ := this.GetInt64("sick_type")
 	reg_type := this.GetString("p_type")
 
 		Phone:                  phone,
 		SocialType:             social_type,
 		IdCardType:             id_card_type,
-		Diagnosis:              diagnosis_id,
+		Diagnosis:              diagnosis_ids,
 		PType:                  reg_type,
 		SickType:               sick_type,
 	}

models/his_hospital_models.go

 	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"`
 
-	IsPre int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	IsPre     int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisHospitalOrder) TableName() string {

models/his_models.go

 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (Drug) TableName() string {
 	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"`
+	Diagnosis          string          `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        int64           `gorm:"column:departments" json:"departments" form:"departments"`
 
 	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
-	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
-	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
-	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
-	IsPre           int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	SettleType      int64  `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime int64  `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime   int64  `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	IsPre           int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis       string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (TempHisOrder) TableName() string {
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (VMDrug) TableName() string {
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	//HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
 }
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis               string                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisOrder) TableName() string {
 	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }

models/self_drug_models.go

 	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit  string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (XtBaseDrug) TableName() string {

models/service/stock_service.go

 }
 
 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"`
-	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	Total           float64 `gorm:"column:total" json:"total" form:"total"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType              int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit        string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace       string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm        int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer          int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (Drug) TableName() string {

service/drug_stock_service.go

 )
 
 type DrugConfig struct {
-	ID           int64        `gorm:"column:id" json:"id" form:"id"`
-	DrugName     string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	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"`
-	DrugStatus   string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	Status       int64        `gorm:"column:status" json:"status" form:"status"`
-	OrgId        int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Manufacturer int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	DrugSpecs    []DrugConfig `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
-	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	Total        float64      `gorm:"column:total" json:"total" form:"total"`
+	ID                    int64        `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	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"`
+	DrugStatus            string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	Status                int64        `gorm:"column:status" json:"status" form:"status"`
+	OrgId                 int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Manufacturer          int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	DrugSpecs             []DrugConfig `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+	RetailPrice           float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice             float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	MinUnit               string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	HospApprFlag          int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                 float64      `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string       `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (DrugConfig) TableName() string {
 	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
 	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
 
-	Total float64 `gorm:"column:total" json:"total" form:"total"`
+	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (DrugStockInfo) TableName() string {

service/his_hospital_service.go

 	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"`
+	Diagnosis          string             `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"`

service/his_project_service.go

 }
 
 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})
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", 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 = ?  AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
 
 	return
 }

service/his_service.go

 	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"`
+	Diagnosis          string `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"`
 	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"`
 	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (VMHisOrder) TableName() string {
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 
 }
 
+func FindLastPatientPrescriptionInfoTwo(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
 	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"`
 	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisOrder) TableName() string {
 	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"`
+	Diagnosis             string                       `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           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
 	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"`
 	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (XtHisOrder) TableName() string {
 	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"`
 	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (CustomInComeStatistics) TableName() string {

service/self_drug_service.go

 }
 
 type Drugs 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"`
-	DrugStatus         string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	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"`
-	Status             int64    `gorm:"column:status" json:"status" form:"status"`
-	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
-	HospApprFlag       int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag        int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	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"`
+	DrugStatus            string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	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"`
+	Status                int64    `gorm:"column:status" json:"status" form:"status"`
+	OrgId                 int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MinUnit               string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Drugs                 []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+	HospApprFlag          int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	PrescribingNumberUnit string   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 }
 
 func (Drugs) TableName() string {