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

controllers/zh/zh_his_api_controller.go

@@ -1387,12 +1387,12 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
-		//var pagesize int = 100
-		//var start int = 1
-		//var stop int
-		//var pagecount int
-		//var curpage int
-		//var isSuccess bool = true
+		var pagesize int = 100
+		var start int = 1
+		var stop int
+		var pagecount int
+		var curpage int
+		var isSuccess bool = true
 
 		var customs []*models.NewCustom
 
@@ -1451,21 +1451,20 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				}
 			}
 
-			//for _, subItem := range item.HisAdditionalCharge {
-			//	if len(subItem.XtHisAddtionConfig.Code) > 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.XtHisAddtionConfig.Code,
-			//			HospApprFlag:     -1,
-			//		}
-			//		customs = append(customs, cus)
-			//	}
-			//}
+			for _, subItem := range item.HisAdditionalCharge {
+				if len(subItem.XtHisAddtionConfig.Code) > 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.XtHisAddtionConfig.Code,
+						HospApprFlag:     -1,
+					}
+					customs = append(customs, cus)
+				}
+			}
 		}
-		fmt.Println(customs)
 
 		////总页数,向上取整,注意除之前要先转换类型为float64
 		//pagecount = int(math.Ceil(float64(len(customs)) / float64(pagesize)))

service/zh_his_service.go

@@ -915,7 +915,7 @@ func GetZHHisPrescription(org_id int64, patient_id int64, record_date int64) (pr
 			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("GoodInfo", "status = 1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 4 AND p_type = 1", org_id, record_date, patient_id).
 		Find(&prescription).Error
@@ -931,7 +931,7 @@ func GetZHMonthHisPrescription(org_id int64, patient_id int64, start_time 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("GoodInfo", "status = 1")
 		}).
 		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND order_status <> 4 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
 		Find(&prescription).Error