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

controllers/sg/his_api_controller.go

@@ -2037,14 +2037,14 @@ func (c *HisApiController) GetUploadInfo() {
 
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	fmt.Println(his_patient_id)
-	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	strconv.FormatInt(his.PatientId, 10)