提交代码

controllers/his_api_controller.go

 	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type, 0)
 
 	if patient_type == 2 && c.GetAdminUserInfo().CurrentOrgId == 10721 {
-		fmt.Println("111111")
-		patients_three, _ := service.GetFuTouHisPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		patients_three, _ := service.GetFuTouHisPatientList(adminInfo.CurrentOrgId, recordDateTime)
+		patients_four, _ := service.GetScheduleHisPatientListTwo(adminInfo.CurrentOrgId, recordDateTime)
+
 		fmt.Println(patients_three)
 		//获取当前用户的信息
 		adminUserInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
 		noElementsSlice := make([]service.PatientThree, 0)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":       patients_three,
-			"list_two":   patients_three,
+			"list_two":   patients_four,
 			"list_three": noElementsSlice,
 			"info":       adminUserInfo,
 			"doctors":    doctors,
 						med_type = "14"
 					}
 
+					if items["diagnoses"] == nil || reflect.TypeOf(items["diagnoses"]).String() != "string" {
+						utils.ErrorLog("diagnoses")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					//med_type := strconv.Itoa(int(items["med_type"].(float64)))
+					diagnoses, _ := items["diagnoses"].(string)
+
 					//if order_status == 0 {
 					//	order_status = 1
 					//}
 							PreTime:            pTime,
 							PType:              p_type,
 							MedType:            med_type,
+							Diagnose:           diagnoses,
 						}
 						tempPrescription = prescription
 						service.SaveHisPrescriptionOne(tx, tempPrescription)
 						//tempPrescription.OrderStatus = order_status
 						tempPrescription.PreTime = pTime
 						tempPrescription.MedType = med_type
+						tempPrescription.Diagnose = diagnoses
+
 						service.SaveHisPrescriptionOne(tx, tempPrescription)
 						redis := service.RedisClient()
 						key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 					//	order_status = 1
 					//}
 
+					if items["diagnoses"] == nil || reflect.TypeOf(items["diagnoses"]).String() != "string" {
+						utils.ErrorLog("diagnoses")
+					}
+					diagnoses, _ := items["diagnoses"].(string)
+
 					if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
 						utils.ErrorLog("pre_time")
 					}
 							PreTime:            pTime,
 							PType:              p_type,
 							MedType:            med_type,
+							Diagnose:           diagnoses,
 						}
 						tempPrescription = prescription
 						service.SaveHisPrescription(tempPrescription)
 						//tempPrescription.OrderStatus = order_status
 						tempPrescription.PreTime = pTime
 						tempPrescription.MedType = med_type
+						tempPrescription.Diagnose = diagnoses
+
 						service.SaveHisPrescription(tempPrescription)
 						redis := service.RedisClient()
 						key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"

controllers/his_project_api_controller.go

 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
-	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime, 0)
+	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime, 0, 0)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetMobileAdminUserInfo()
-	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime, sch_type)
+	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime, sch_type, 0)
 	patients_two, _ := service.GetHisPatientList(adminInfo.Org.Id, "", recordDateTime)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)

service/his_service.go

 	return "his_prescription"
 }
 
-func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64, patient_type int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type <> 4", org_id)
 
 	if sch_type != 0 {
 		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
 	return
 }
 
+func GetScheduleHisPatientListTwo(org_id int64, record_date int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type = 4", org_id)
+
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
+	return
+}
+
+func GetFuTouHisPatientList(org_id int64, record_date int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type").Where("xt_patients.patient_type = 4 and xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	err = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Error
+	return
+}
+
 func GetChargeHisPatientListOne(org_id int64, keywords string, record_date int64) (patients []*Patients, err error) {
 	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	return "his_prescription"
 }
 
-func GetNewHisPatientList(org_id int64, record_date int64, sch_type int64) (patients []*PatientTwo, err error) {
-	db := readDb.Model(&PatientTwo{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
+func GetNewHisPatientList(org_id int64, record_date int64, sch_type int64, patient_type int64) (patients []*PatientTwo, err error) {
+	db := readDb.Model(&PatientTwo{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type <> 4", org_id).
 		Joins("join his_patient as hp ON hp.patient_id = xt_patients.id AND hp.record_date = ? AND hp.status = 1 AND hp.user_org_id = ?", record_date, org_id)
 	if sch_type > 0 {
 		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND schedule_type = ?", record_date, org_id, sch_type)