耗材参数

controllers/his_api_controller.go

@@ -319,6 +319,9 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 				service.SaveHisPrescription(prescription)
 
+				//更改患者挂号状态
+				_, err := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.CurrentOrgId)
+				fmt.Println("更改失败", err)
 				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 					advices := items["advices"].([]interface{})
 					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)

controllers/his_project_api_controller.go

@@ -764,6 +764,7 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			Phone:                  phone,
 			SocialType:             social_type,
 		}
+
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
 		timeStr := time.Now().Format("2006-01-02")
@@ -810,24 +811,33 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			Status:                 1,
 			IsReturn:               1,
 		}
-		err := service.CreateHisPatient(&patient)
-		lastPatient, err := service.GetLastPatient(orgId)
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
 
-		hisPatient := models.HisPatient{
-			Number: str,
-		}
-		err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
-		//fmt.Println("er", err)
-		if err != nil {
+		//查询今日没有退号的患者是否已挂号
+		_, errcode := service.GetTodayHisPatient(nowtime, bloodPatient.ID, adminUserInfo.CurrentOrgId)
+		if errcode == gorm.ErrRecordNotFound {
+			err := service.CreateHisPatient(&patient)
+			lastPatient, err := service.GetLastPatient(orgId)
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
+
+			hisPatient := models.HisPatient{
+				Number: str,
+			}
+			err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
+			//fmt.Println("er", err)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"patient": patient,
+			})
+		} else if errcode == nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 			return
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"patient": patient,
-		})
+
 	}
 }
 
@@ -1020,7 +1030,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	recordDateTime := theTime.Unix()
 	//prescription_id, _ := this.GetInt64("prescription_id")
 	adminUserInfo := this.GetAdminUserInfo()
-	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs)
+	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId)
 	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
 	//doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
 	//patient, err := service.GetBloodPatientByPatient(patient_id)

service/his_project_service.go

@@ -344,7 +344,7 @@ func GetBloodPatientInfoById(patientid int64) (models.XtPatients, error) {
 func GetPatientCaseHistory(patientid int64) (models.HisPatientCaseHistory, error) {
 
 	history := models.HisPatientCaseHistory{}
-	err := XTReadDB().Model(&history).Where("patient_id = ? and status = 1", patientid).Find(&history).Error
+	err := XTReadDB().Model(&history).Where("patient_id = ? and status = 1", patientid).Last(&history).Error
 	return history, err
 }
 
@@ -387,10 +387,10 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 	return hisPatient, err
 }
 
-func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string) (prescription []*models.HisPrescription, err error) {
+func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1", orgid).Find(&prescription).Error
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1").Preload("HisDoctorAdviceInfo", "status = 1").Preload("HisPrescriptionProject", "status = 1").Preload("XtHisAdditionalCharge", "status = 1").Find(&prescription).Error
-	//err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ? and prescription_id = ?", his_patient_id, recorddate, prescription_id).Find(&prescription).Error
 	return prescription, err
 }
 
@@ -588,3 +588,17 @@ func GetPrescriptionByPatientId(patient_id int64, startime int64) (prescritpion
 	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? and record_date =?", patient_id, startime).Find(&prescritpion).Error
 	return prescritpion, err
 }
+
+func GetTodayHisPatient(recod_date int64, patientid int64, user_org_id int64) (*models.XtHisPatient, error) {
+
+	patient := models.XtHisPatient{}
+	err := XTReadDB().Model(&patient).Where("record_date = ? and patient_id = ? and user_org_id = ? and is_return = 1 and status = 1", recod_date, patientid, user_org_id).Find(&patient).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &patient, nil
+}

service/his_service.go

@@ -686,3 +686,10 @@ func GetHisPatientPrescriptionList(org_id int64, keywords string, record_date in
 	err = db.Limit(limit).Offset(offset).Find(&patients).Error
 	return
 }
+
+func UpdateHisPatientIsReturn(patientid int64, recorddate int64, orgid int64) (models.VMHisPatient, error) {
+
+	patient := models.VMHisPatient{}
+	err := XTWriteDB().Model(&patient).Where("patient_id = ? and record_date = ? and user_org_id = ? and status = 1", patientid, recorddate, orgid).Updates(map[string]interface{}{"is_return": 3}).Error
+	return patient, err
+}