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

controllers/zh/zh_his_api_controller.go

@@ -1769,12 +1769,19 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
 
+	theTimeTwo, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 23:59:59", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTimeTwo := theTimeTwo.Unix()
+
 	//var prescriptions []*models.HisPrescription
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
 	if settle_accounts_type == 1 { //日结
-		infos, _ := service.GetZHHisUploadOrderInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+		infos, _ := service.GetZHHisUploadOrderInfo(adminUser.CurrentOrgId, patient_id, recordDateTime, recordDateTimeTwo)
 		record, _ := service.GetInHospitalRecord(his_patient_id)
 		var isSuccess bool = true
 

service/zh_his_service.go

@@ -970,9 +970,9 @@ func GetZHMonthHisUploadPrescription(org_id int64, patient_id int64, start_time
 	return
 }
 
-func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64) (infos []*models.HisOrderInfo, err error) {
+func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64, record_end_date int64) (infos []*models.HisOrderInfo, err error) {
 	err = readDb.Model(&models.HisOrderInfo{}).
-		Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ? ", org_id, record_date, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ? ", org_id, record_end_date, record_date, patient_id).
 		Find(&infos).Error
 	return
 }