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

controllers/sg/his_api_controller.go

@@ -2185,7 +2185,7 @@ func (c *HisApiController) GetUploadInfo() {
 						SettleAccountsDate:    recordDateTime,
 						Ctime:                 time.Now().Unix(),
 						Mtime:                 time.Now().Unix(),
-						Status:                0,
+						Status:                1,
 						Number:                chrg_bchno,
 						Infcode:               res.Infcode,
 						WarnMsg:               res.WarnMsg,
@@ -3376,7 +3376,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					SettleAccountsDate:  recordDateTime,
 					Ctime:               time.Now().Unix(),
 					Mtime:               time.Now().Unix(),
-					Status:              0,
+					Status:              1,
 					Number:              chrg_bchno,
 					Infcode:             res.Infcode,
 					WarnMsg:             res.WarnMsg,

service/his_service.go

@@ -1326,7 +1326,7 @@ func GetTodayHisOrder(org_id int64, patient_id int64, record_time int64, number
 }
 
 func GetOrderCountByNumber(org_id int64, patient_id int64, record_time int64, number string) (count int64, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 3 AND mdtrt_id = ?", org_id, patient_id, record_time, number).Count(&count).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 2 AND mdtrt_id = ?", org_id, patient_id, record_time, number).Count(&count).Error
 
 	return
 }