Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/his_api_controller.go

@@ -399,8 +399,8 @@ func (c *HisApiController) CreateHisPrescription() {
 								var project_id int64
 								var project_type int64
 								var totals float64
-								if project.(map[string]interface{})["id"] != nil || reflect.TypeOf(project.(map[string]interface{})["id"]).String() == "float64" {
-									project_id = int64(project.(map[string]interface{})["id"].(float64))
+								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
 								}
 								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
 									project_type = int64(project.(map[string]interface{})["type"].(float64))

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3962,6 +3962,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 
 	goodTypes, _ := service.FindAllGoodType(adminUser.Org.Id)
 
+	project, _ := service.GetHisPrescriptionProject(adminUser.Org.Id, patient_id, date.Unix())
+
 	//获取当天该病人的透析处方
 	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
@@ -3975,6 +3977,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
+				item.Project = project
+
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3993,6 +3997,7 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 			for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
 				goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.Org.Id, date.Unix())
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
+				item.Project = project
 
 				fmt.Println(goodUser)
 				fmt.Println(lastGoodUserDetial)
@@ -4008,6 +4013,7 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				"total":          total,
 				"prescribe":      prescribe,
 				"good_info":      good_info,
+				"project":        project,
 			})
 			return
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -356,8 +356,8 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 								var project_id int64
 								var project_type int64
 								var totals float64
-								if project.(map[string]interface{})["id"] != nil || reflect.TypeOf(project.(map[string]interface{})["id"]).String() == "float64" {
-									project_id = int64(project.(map[string]interface{})["id"].(float64))
+								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
 								}
 								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
 									project_type = int64(project.(map[string]interface{})["type"].(float64))

service/mobile_dialysis_service.go

@@ -1562,12 +1562,13 @@ type MDialysisGoodsVM struct {
 	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
 	Status       int64 `gorm:"column:status" json:"status"`
 
-	DeviceNumber              *MDeviceNumberVM         `gorm:"ForeignKey:BedId" json:"device_number"`
-	SchedualPatient           *MSchedualPatientVMList  `gorm:"ForeignKey:PatientId" json:"patient"`
-	AutomaticReduceDetail     []*AutomaticReduceDetail `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"good_user"`
-	LastAutomaticReduceDetail []*AutomaticReduceDetail `gorm:"-" json:"last_good_user"`
-	DialysisBeforePrepare     []*DialysisBeforePrepare `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordDate" json:"good_user_detail"`
-	LastDialysisBeforePrepare []*DialysisBeforePrepare `gorm:"-" json:"last_good_user_detail"`
+	DeviceNumber              *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient           *MSchedualPatientVMList          `gorm:"ForeignKey:PatientId" json:"patient"`
+	AutomaticReduceDetail     []*AutomaticReduceDetail         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"good_user"`
+	LastAutomaticReduceDetail []*AutomaticReduceDetail         `gorm:"-" json:"last_good_user"`
+	DialysisBeforePrepare     []*DialysisBeforePrepare         `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordDate" json:"good_user_detail"`
+	LastDialysisBeforePrepare []*DialysisBeforePrepare         `gorm:"-" json:"last_good_user_detail"`
+	Project                   []*models.HisPrescriptionProject `gorm:"-" json:"project"`
 }
 
 func (MDialysisGoodsVM) TableName() string {
@@ -2114,7 +2115,9 @@ func GetHisProjectConfig(orgid int64) (models.XtHisProjectConfig, error) {
 }
 
 func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status=1").Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("GoodsType", "status = 1").Where("status = 1 ")
+	}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
 
 	return
 }