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

controllers/sg/his_api_controller.go

@@ -2045,7 +2045,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
-		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+		prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 		data["pre"] = prescriptions
 
 	} else { //月结