医保对接

controllers/dialysis_api_controller.go

@@ -2582,27 +2582,27 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	project_config, _ := service.GetHisProjectConfig(adminUserInfo.CurrentOrgId)
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
-		for _, item := range projects {
-			var advice *models.HisDoctorAdviceInfo
-			advice.ID = item.ID
-			advice.Checker = item.Checker
-			advice.CheckTime = item.CheckTime
-			advice.CheckState = item.CheckState
-			advice.ExecutionState = item.ExecutionState
-			advice.ExecutionStaff = item.ExecutionStaff
-			advice.PrescribingNumber = float64(item.Count)
-			advice.PrescribingNumberUnit = item.Unit
-			advice.AdviceDoctor = item.Doctor
-			if item.Type == 3 {
-				advice.AdviceName = item.GoodInfo.GoodName
-			} else if item.Type == 2 {
-				advice.AdviceName = item.HisProject.ProjectName
-			}
-			advice.StartTime = item.StartTime
-			hisAdvice = append(hisAdvice, advice)
-		}
-	}
+	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
+	//	for _, item := range projects {
+	//		var advice *models.HisDoctorAdviceInfo
+	//		advice.ID = item.ID
+	//		advice.Checker = item.Checker
+	//		advice.CheckTime = item.CheckTime
+	//		advice.CheckState = item.CheckState
+	//		advice.ExecutionState = item.ExecutionState
+	//		advice.ExecutionStaff = item.ExecutionStaff
+	//		advice.PrescribingNumber = float64(item.Count)
+	//		advice.PrescribingNumberUnit = item.Unit
+	//		advice.AdviceDoctor = item.Doctor
+	//		if item.Type == 3 {
+	//			advice.AdviceName = item.GoodInfo.GoodName
+	//		} else if item.Type == 2 {
+	//			advice.AdviceName = item.HisProject.ProjectName
+	//		}
+	//		advice.StartTime = item.StartTime
+	//		hisAdvice = append(hisAdvice, advice)
+	//	}
+	//}
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"xtdate":                    xtdate,
@@ -2635,6 +2635,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"lastPredialysisEvaluation": lastPredialysisEvaluation,
 			"dialysiscount":             dialysiscount,
 			"last_order":                lastOrder,
+			"project_config":            project_config,
+			"projects":                  projects,
 		})
 
 	}
@@ -2670,6 +2672,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"lastPredialysisEvaluation": lastPredialysisEvaluation,
 			"dialysiscount":             dialysiscount,
 			"last_order":                lastOrder,
+			"project_config":            project_config,
+			"projects":                  projects,
 		})
 
 	}

controllers/his_api_controller.go

@@ -290,7 +290,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose, _ := c.GetInt64("diagnose")
+	diagnose := c.GetString("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
@@ -714,7 +714,7 @@ func (c *HisApiController) EditHisPrescription() {
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose, _ := c.GetInt64("diagnose")
+	diagnose := c.GetString("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -257,7 +257,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose, _ := c.GetInt64("diagnose")
+	//diagnose := c.GetString("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
@@ -400,15 +400,15 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 		p_number := timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(int64(adminInfo.Org.Id), 10) + strconv.FormatInt(int64(patient_id), 10)
 
 		hpInfo = models.HisPrescriptionInfo{
-			UserOrgId:          adminInfo.Org.Id,
-			RecordDate:         theTime.Unix(),
-			PatientId:          patient_id,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			Creator:            adminInfo.AdminUser.Id,
-			Modifier:           adminInfo.AdminUser.Id,
-			Diagnosis:          diagnose,
+			UserOrgId:  adminInfo.Org.Id,
+			RecordDate: theTime.Unix(),
+			PatientId:  patient_id,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			Creator:    adminInfo.AdminUser.Id,
+			Modifier:   adminInfo.AdminUser.Id,
+			//Diagnosis:          diagnose,
 			SickHistory:        sick_history,
 			Departments:        department,
 			RegisterType:       reg_type,
@@ -432,7 +432,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 			Mtime:              time.Now().Unix(),
 			Creator:            info.Creator,
 			Modifier:           adminInfo.AdminUser.Id,
-			Diagnosis:          diagnose,
+			Diagnosis:          info.Diagnosis,
 			SickHistory:        sick_history,
 			Departments:        department,
 			RegisterType:       reg_type,

models/his_models.go

@@ -374,7 +374,7 @@ type HisPrescriptionInfo struct {
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`

service/his_hospital_service.go

@@ -140,7 +140,7 @@ type VMHisHospitalPrescriptionInfo struct {
 	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64              `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          string             `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64              `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string             `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        string             `gorm:"column:departments" json:"departments" form:"departments"`

service/his_service.go

@@ -66,7 +66,7 @@ type VMHisPrescriptionInfo struct {
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          int64  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`