Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -3012,7 +3012,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	var end_time int64
 
 	if settle_accounts_type == 1 { //日结
-		prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+		prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")
@@ -3035,7 +3035,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 		recordEndTime := theEndTime.Unix()
 		end_time = recordEndTime
 
-		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
+		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, patient_id, recordStartTime, recordEndTime, strconv.Itoa(int(reg_type)))
 	}
 
 	var ids []int64

service/his_service.go

@@ -296,7 +296,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 	return
 }
 
-func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64, reg_type string) (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")
@@ -307,7 +307,7 @@ func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, record_date, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, record_date, his_patient_id, reg_type).
 		Find(&prescription).Error
 	return
 }
@@ -1023,7 +1023,7 @@ func FindSickById(id int64) (*models.OutpatientServiceSick, error) {
 //	return "his_prescription"
 //}
 
-func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, end_time int64, reg_type string) (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")
@@ -1034,7 +1034,7 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, e
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
 		}).
-		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1  AND p_type <> 1", org_id, start_time, end_time, patient_id).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1  AND p_type <> 1 AND med_type = ?", org_id, start_time, end_time, patient_id, reg_type).
 		Find(&prescription).Error
 	return
 }