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

controllers/zh/zh_his_api_controller.go

 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	order, _ := service.GetHisOrderByID(order_id)
-	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
+
 	var rf []*ResultFive
 	json.Unmarshal([]byte(record.Iinfo), &rf)
 	chrg_bchno := order.Number
 	}
 	var result string
 	var src_resquest string
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record.InHosptialTime, loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordStartDateTime := theTime.Unix()
+
+	theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", record.OutHosptialTime, loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordEndDateTime := theTimeEnd.Unix()
+
+	prescriptions, _ := service.GetZHSettleMonthHisPrescription(c.GetAdminUserInfo().CurrentOrgId, patient_id, recordStartDateTime, recordEndDateTime)
+
+	var total float64
+	for _, item := range prescriptions {
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				total = total + (subItem.Price * subItem.PrescribingNumber)
+			}
+		}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cnt)
+			}
+		}
+	}
+	allTotal := fmt.Sprintf("%.2f", total)
 	result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
 	//saveLog()
 	saveLog(result, src_resquest, "2304", "住院结算")

service/zh_his_service.go

 //
 //	err = readDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? AND ")
 //}
+
+func GetZHSettleMonthHisPrescription(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			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").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
+	return
+}