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

controllers/sg/his_api_controller.go

@@ -2080,7 +2080,7 @@ func (c *HisApiController) GetUploadInfo() {
 	sickConfig, _ := service.FindSickById(sick_type)
 
 	if tempOrder.ID == 0 {
-		tempOrder, _ = service.GetTodayHisOrder(adminUser.CurrentOrgId, id, recordDateTime)
+		tempOrder, _ = service.GetTodayHisOrder(adminUser.CurrentOrgId, id, recordDateTime, his.Number)
 	}
 
 	if tempOrder.ID == 0 {

service/his_service.go

@@ -1320,7 +1320,7 @@ func GetNewHisPatientInfoFour(org_id int64, id int64) (info models.HisPatient, e
 	return
 }
 
-func GetTodayHisOrder(org_id int64, patient_id int64, record_time int64) (order models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 1", org_id, patient_id, record_time).First(&order).Error
+func GetTodayHisOrder(org_id int64, patient_id int64, record_time int64, number string) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 1 AND mdtrt_id = ?", org_id, patient_id, record_time, number).First(&order).Error
 	return
 }