1111

controllers/his_api_controller.go

@@ -684,6 +684,10 @@ func (c *HisApiController) GetRegisterInfo() {
 	social_type, _ := c.GetInt64("social_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
+	diagnosis_id, _ := c.GetInt64("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type := c.GetString("p_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
@@ -703,7 +707,14 @@ func (c *HisApiController) GetRegisterInfo() {
 	} else {
 		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, id)
 	}
+
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+	if patientPrescription.ID == 0 {
+		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+	}
+	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
+	sickConfig, _ := service.FindSickById(sick_type)
+
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
@@ -795,8 +806,6 @@ func (c *HisApiController) GetRegisterInfo() {
 			count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
-			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
-			sickConfig, _ := service.FindSickById(patientPrescription.SickType)
 
 			IdCardNo := ""
 			if id_card_type == 1 {
@@ -867,7 +876,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				if err == nil {
 					api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 						"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-						"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+						"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + reg_type + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
 						"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
 					resp2, requestErr2 := http.Get(api2)
 					if requestErr2 != nil {

service/his_service.go

@@ -284,7 +284,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?  AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -921,7 +921,7 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, e
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 AND status = 1 ", org_id, start_time, end_time, patient_id).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1 ", org_id, start_time, end_time, patient_id).
 		Find(&prescription).Error
 	return
 }