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

controllers/sz/sz_his_api_controller.go

@@ -2152,6 +2152,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
+	id_str := c.GetString("ids")
+	ids_arr := strings.Split(id_str,  ",")
+
 	order_id, _ := c.GetInt64("order_id")
 
 	sick_type, _ := c.GetInt64("sick_type")
@@ -2193,7 +2196,12 @@ func (c *SZHisApiController) GetSettleInfo() {
 		var end_time int64
 
 		if settle_accounts_type == 1 { //日结
-			prescriptions, _ = service.GetNewHisPrescriptionTwo(adminUser.CurrentOrgId, his_patient_id, recordDateTime, his.MedicalTreatmentType)
+			if reg_type == 11{
+
+				prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
+		   }else{
+			prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+		   }
 
 		} else { //月结
 			start_time_str := c.GetString("start_time")
@@ -2985,6 +2993,9 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	reg_type, _ := c.GetInt64("p_type")
 	sick_type, _ := c.GetInt64("sick_type")
 
+	id_str := c.GetString("ids")
+	ids_arr := strings.Split(id_str,  ",")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -3013,7 +3024,12 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	var end_time int64
 
 	if settle_accounts_type == 1 { //日结
-		prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+		if reg_type == 11{
+
+			prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
+		   }else{
+			prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
+		   }
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")

service/his_service.go

@@ -1097,6 +1097,25 @@ func GetDoctorList(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 	return role, err
 }
 
+func GetPrescriptionByIds(ids []string, org_id 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")
+	 }).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+	 return db.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
+	 Where("id in (?) AND user_org_id = ? AND status = 1", ids,org_id).
+	 Find(&prescription).Error
+	
+	return
+   }
+
 func GetDoctorListTwo(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 
 	db := UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1 AND x.user_type = 2 AND x.org_id = ?", orgid)