打印單

controllers/his_api_controller.go

@@ -5228,6 +5228,7 @@ func (c *HisApiController) GetHisPrescriptionList() {
 	keywords := c.GetString("keywords")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	sch_type, _ := c.GetInt64("sch_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -5238,7 +5239,7 @@ func (c *HisApiController) GetHisPrescriptionList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	prescriptionOrder, err, total := service.GetNewHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit)
+	prescriptionOrder, err, total := service.GetNewHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit, sch_type)
 
 	//adminInfo := c.GetAdminUserInfo()
 	//prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)

controllers/his_project_api_controller.go

@@ -1239,10 +1239,6 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	schIDStr := this.GetString("ids")
 	p_type, _ := this.GetInt64("p_type")
 
-	if len(schIDStr) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
 	idStrs := strings.Split(schIDStr, ",")
 
 	timeLayout := "2006-01-02"

models/his_print_models.go

@@ -1,15 +1,18 @@
 package models
 
 type PrintPatient 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"`
-	Age                     string                  `gorm:"column:age" json:"age" form:"age"`
-	Gender                  int64                   `gorm:"column:gender" json:"gender" form:"gender"`
-	HomeAddress             string                  `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	Phone                   string                  `gorm:"column:phone" json:"phone" form:"phone"`
-	Lapseto                 int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status                  int64                   `gorm:"column:status" json:"status" form:"status"`
+	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"`
+	Age                string `gorm:"column:age" json:"age" form:"age"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	HomeAddress        string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	Phone              string `gorm:"column:phone" json:"phone" form:"phone"`
+	Lapseto            int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	ReimbursementWayId int64  `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+
 	HisPrintPatient         HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisHospitalCheckRecord  HisHospitalCheckRecord  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_record_patient"`
 	HisPrescriptionInfoTwo  HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`

service/his_service.go

@@ -1396,17 +1396,21 @@ 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) {
+func GetNewHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64, sch_type int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("his_prescription_info.user_org_id = ? AND his_prescription_info.status = 1 AND his_prescription_info.record_date = ? AND his_prescription_info.p_type <> 1 ", org_id, record_date)
+
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients  On his_prescription_info.patient_id = xt_patients.id  AND xt_patients.name like ?", keywords)
 	}
+	if sch_type > 0 {
+		db = db.Joins("JOIN xt_schedule  On xt_schedule.status = 1 AND his_prescription_info.patient_id = xt_schedule.patient_id AND xt_schedule.schedule_date = ?  AND xt_schedule.schedule_type = ?", record_date, sch_type)
+	}
 	db = db.Preload("Patients", "xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPrescription", "his_prescription.user_org_id = ? AND his_prescription.status = 1 AND his_prescription.p_type <> 1", org_id)
 	db = db.Count(&total)
-	err = db.Limit(limit).Offset(offset).Find(&patients).Error
+	err = db.Limit(limit).Offset(offset).Group("his_prescription_info.id").Find(&patients).Error
 	return
 }