Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/zh/zh_his_api_controller.go

@@ -949,17 +949,30 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				for _, subItem := range item.HisPrescriptionProject {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
-					if len(subItem.HisProject.MedicalCode) > 0 {
-
-						cus := &models.NewCustom{
-							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-							Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-							FeedetlSn:        subItem.FeedetlSn,
-							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-							MedListCodg:      subItem.HisProject.MedicalCode,
-							HospApprFlag:     -1,
+					if subItem.Type == 2 {
+						if len(subItem.HisProject.MedicalCode) > 0 {
+							cus := &models.NewCustom{
+								DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+								Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+								FeedetlSn:        subItem.FeedetlSn,
+								Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+								MedListCodg:      subItem.HisProject.MedicalCode,
+								HospApprFlag:     -1,
+							}
+							customs = append(customs, cus)
+						}
+					} else if subItem.Type == 3 {
+						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+							cus := &models.NewCustom{
+								DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+								Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+								FeedetlSn:        subItem.FeedetlSn,
+								Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+								HospApprFlag:     -1,
+							}
+							customs = append(customs, cus)
 						}
-						customs = append(customs, cus)
 					}
 				}
 			}

models/his_models.go

@@ -500,6 +500,8 @@ type HisPrescriptionProject struct {
 	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:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Type               int64      `gorm:"column:type" json:"type" form:"type"`
 	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
 	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
 }

service/gdyb_service.go

@@ -644,18 +644,35 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 			for _, subItem := range item.HisPrescriptionProject {
 				//var randNum int
 				//randNum = rand.Intn(10000) + 1000
-				if len(subItem.HisProject.MedicalCode) > 0 {
+				if subItem.Type == 2 {
+					if len(subItem.HisProject.MedicalCode) > 0 {
+
+						cus := &Custom{
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+							Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+							MedListCodg:      subItem.HisProject.MedicalCode,
+							HospApprFlag:     -1,
+						}
+						customs = append(customs, cus)
+					}
 
-					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-						MedListCodg:      subItem.HisProject.MedicalCode,
-						HospApprFlag:     -1,
+				} else if subItem.Type == 3 {
+					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+						cus := &Custom{
+							DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+							Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+							HospApprFlag:     -1,
+						}
+						customs = append(customs, cus)
 					}
-					customs = append(customs, cus)
+
 				}
+
 			}
 		}
 

service/his_service.go

@@ -305,7 +305,7 @@ func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodType", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, record_date, his_patient_id).
 		Find(&prescription).Error
@@ -940,7 +940,7 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("HisProject", "status = 1").Where("status = 1")
+		return db.Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})
 	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
 	return
@@ -1031,7 +1031,7 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, e
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodType", "status=1")
 		}).
 		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1  AND p_type <> 1", org_id, start_time, end_time, patient_id).
 		Find(&prescription).Error