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

controllers/sg/his_api_controller.go

@@ -1954,8 +1954,8 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
-
-	tempOrder, _ := service.GetHisOrderByID(order_id)
+	var tempOrder models.HisOrder
+	tempOrder, _ = service.GetHisOrderByID(order_id)
 
 	var prescriptions []*models.HisPrescription
 
@@ -2012,6 +2012,11 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 
 	sickConfig, _ := service.FindSickById(sick_type)
+
+	if tempOrder.ID == 0 {
+		tempOrder, _ = service.GetTodayHisOrder(adminUser.CurrentOrgId, id, recordDateTime)
+	}
+
 	if tempOrder.ID == 0 {
 		var result string
 		if miConfig.InsuplcAdmdvs == "440781" { //

service/his_service.go

@@ -1313,3 +1313,8 @@ func GetNewHisPatientInfoFour(org_id int64, id int64) (info models.HisPatient, e
 	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&info).Error
 	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
+	return
+}