耗材参数

controllers/his_project_api_controller.go

@@ -749,19 +749,19 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			Status:              1,
-			RecordDate:          nowtime,
-			IsReturn:            1,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			Status:                 1,
+			RecordDate:             nowtime,
+			IsReturn:               1,
+			Ctime:                  time.Now().Unix(),
+			Phone:                  phone,
+			SocialType:             social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
@@ -794,17 +794,17 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			PatientId:           bloodPatient.ID,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			PatientId:              bloodPatient.ID,
+			Ctime:                  time.Now().Unix(),
+			Phone:                  phone,
+			SocialType:             social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		if err != nil {
@@ -993,25 +993,34 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date := this.GetString("record_date")
+	schIDStr := this.GetString("ids")
+	if len(schIDStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	idStrs := strings.Split(schIDStr, ",")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
-	prescription_id, _ := this.GetInt64("prescription_id")
-	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, prescription_id)
-
-	doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
-	patient, err := service.GetBloodPatientByPatient(patient_id)
-	prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
+	//prescription_id, _ := this.GetInt64("prescription_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs)
+	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
+	//doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
+	//patient, err := service.GetBloodPatientByPatient(patient_id)
+	//prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"advicePrint":      advicePrint,
-		"patient":          patient,
-		"doctorPorject":    doctorPorject,
-		"prescriptionInfo": prescriptionInfo,
+		"advicePrint": advicePrint,
+		"projectlist": projectlist,
+		//"patient":          patient,
+		//"doctorPorject":    doctorPorject,
+		//"prescriptionInfo": prescriptionInfo,
 	})
 }
 
@@ -1036,7 +1045,7 @@ func (this *HisProjectApiController) PostPrintHisTemplate() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	_, errcode := service.GetHisTemplateId(template_id, orgId)
-	fmt.Println("errcode0-------", errcode)
+	fmt.Println("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		template := models.XtHisTemplate{
 			TemplateId: template_id,

models/his_models.go

@@ -274,23 +274,24 @@ func (HisPrescriptionInfo) TableName() string {
 }
 
 type HisPrescription struct {
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status             int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Number             string `gorm:"column:number" json:"number" form:"number"`
-	Type               int64  `gorm:"column:type" json:"type" form:"type"`
-	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-
+	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
 }
@@ -446,7 +447,7 @@ type HisPrescriptionProject struct {
 	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	Day                string     `gorm:"column:day" json:"day" form:"day"`
-	HisProject         HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
 }
 

service/his_project_service.go

@@ -387,9 +387,10 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 	return hisPatient, err
 }
 
-func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, prescription_id int64) (prescription []*models.HisDoctorAdviceInfo, err error) {
+func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string) (prescription []*models.HisPrescription, err 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
+	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").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
 }