医保对接

controllers/his_api_controller.go

@@ -977,7 +977,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.CurrentOrgId, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = p.Count
+									consumables.Count = int64(p.Count)
 									service.UpdateConsumables(&consumables)
 								}
 							}
@@ -1293,7 +1293,7 @@ func (c *HisApiController) DeletePrescription() {
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(item.Count, 10), 64)
+						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -1381,7 +1381,7 @@ func (c *HisApiController) DeleteProject() {
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(project.Count, 10), 64)
+				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -1879,7 +1879,7 @@ func (c *HisApiController) setProjectWithJSONTwo(project *models.HisPrescription
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
+		totals, _ := strconv.ParseFloat(total, 64)
 		project.Count = totals
 	}
 
@@ -2253,7 +2253,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
+		totals, _ := strconv.ParseFloat(total, 64)
 		project.Count = totals
 	}
 
@@ -2310,7 +2310,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(project.Count, 10), 64)
+				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -2324,12 +2324,12 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
 					other_count := temp_project.Count - project.Count
-					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(other_count, 10), 64)
+					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
 					other_count := project.Count - temp_project.Count
-					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(other_count, 10), 64)
+					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)
 				}
@@ -4094,7 +4094,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
 			}
 
-			if item.MedChrgitmType == "14" { //其他费
+			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				otherCostSelfTotal = otherCostTotal
 			}
@@ -4151,7 +4151,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "14" { //其他费
+			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()

controllers/his_charge_api_controller.go

@@ -13,7 +13,6 @@ type HisChargeApiController struct {
 
 func HisChargeApiRegistRouters() {
 	beego.Router("/api/his/chargestatistics/detail", &HisChargeApiController{}, "get:GetChargeStatisticsDetail")
-	beego.Router("/api/his/chargestatistics/summary", &HisChargeApiController{}, "get:GetChargeStatisticsSummary")
 	beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
 
 }
@@ -52,40 +51,6 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 
 }
 
-func (c *HisChargeApiController) GetChargeStatisticsSummary() {
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-	adminUser := c.GetAdminUserInfo()
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	if err != nil {
-
-	}
-	startRecordDateTime := startTime.Unix()
-
-	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	if err != nil {
-
-	}
-	endRecordDateTime := endTime.Unix()
-
-	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
-
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"patients": chargePatient,
-		})
-		return
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
-
-	}
-
-}
-
 func (c *HisChargeApiController) GetChargeStatisticsSettle() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
@@ -104,9 +69,7 @@ func (c *HisChargeApiController) GetChargeStatisticsSettle() {
 
 	}
 	endRecordDateTime := endTime.Unix()
-
-	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
-
+	chargePatient, err := service.GetAllPatientChargeSettle(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patients": chargePatient,

controllers/his_hospital_api_controller.go

@@ -33,6 +33,7 @@ func HisHospitalManagerApiRegistRouters() {
 func (c *HisHospitalApiController) GetHisHospitalPatientList() {
 	record_date := c.GetString("record_date")
 	types, _ := c.GetInt64("type", 0)
+	sch_type, _ := c.GetInt64("sch_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -45,7 +46,7 @@ func (c *HisHospitalApiController) GetHisHospitalPatientList() {
 	adminInfo := c.GetAdminUserInfo()
 	//var patients []*service.HospitalPatient
 	tempPatients, _ := service.GetHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
-	tempPatients_two, _ := service.GetHisHospitalSchPatientList(adminInfo.CurrentOrgId, recordDateTime)
+	tempPatients_two, _ := service.GetHisHospitalSchPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
 
 	//当天有登记住院的和排班同时存在的话，删除掉排班的记录
 	for _, item := range tempPatients {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -287,7 +287,7 @@ func (c *MobileHisApiController) DeletePrescription() {
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(item.Count, 10), 64)
+						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -364,7 +364,7 @@ func (c *MobileHisApiController) DeleteProject() {
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(project.Count, 10), 64)
+				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -762,7 +762,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.Org.Id, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = p.Count
+									consumables.Count = int64(p.Count)
 									service.UpdateConsumables(&consumables)
 								}
 							}
@@ -1086,7 +1086,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
+		totals, _ := strconv.ParseFloat(total, 64)
 		project.Count = totals
 	}
 
@@ -1127,7 +1127,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(project.Count, 10), 64)
+				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -1141,12 +1141,12 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
 					other_count := temp_project.Count - project.Count
-					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(other_count, 10), 64)
+					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
 					other_count := project.Count - temp_project.Count
-					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(other_count, 10), 64)
+					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)
 				}

controllers/public_api_controller.go

@@ -1780,73 +1780,58 @@ func (c *PublicApiController) Handle10215() {
 	his, _ := service.GetAllPT(10215)
 	for _, item := range his {
 
-		info := &models.HisPrescriptionInfoTemplate{
-			UserOrgId:   item.UserOrgId,
-			RecordDate:  0,
-			PatientId:   item.PatientId,
-			Status:      1,
-			Ctime:       time.Now().Unix(),
-			Mtime:       time.Now().Unix(),
-			Type:        2,
-			Creator:     0,
-			Modifier:    0,
-			PType:       0,
-			PTemplateId: item.ID,
-			MedType:     "14",
-		}
-		service.CreateHisPrescriptionInfoTemplate(info)
-
-		pro := &models.HisPrescriptionProjectTemplate{
-			ProjectId:          1750,
-			Price:              6.00,
-			UserOrgId:          10215,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			PatientId:          item.PatientId,
-			RecordDate:         0,
-			Count:              1,
-			FeedetlSn:          "",
-			MedListCodg:        "",
-			SingleDose:         "1",
-			DeliveryWay:        "",
-			ExecutionFrequency: "",
-			Day:                "1",
-			Remark:             "",
-			Unit:               "",
-			Type:               2,
-			PrescriptionId:     info.ID,
-			FrequencyType:      1,
-			DayCount:           0,
-			WeekDay:            "",
-		}
-		service.CreateHisPrescriptionProjectTemplate(pro)
-
-		pro2 := &models.HisPrescriptionProjectTemplate{
-			ProjectId:          2462,
-			Price:              4.94,
-			UserOrgId:          10215,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			PatientId:          item.PatientId,
-			RecordDate:         0,
-			Count:              1,
-			FeedetlSn:          "",
-			MedListCodg:        "",
-			SingleDose:         "1",
-			DeliveryWay:        "",
-			ExecutionFrequency: "",
-			Day:                "1",
-			Remark:             "",
-			Unit:               "",
-			Type:               3,
-			PrescriptionId:     info.ID,
-			FrequencyType:      1,
-			DayCount:           0,
-			WeekDay:            "",
-		}
-		service.CreateHisPrescriptionProjectTemplate(pro2)
+		//
+		//pro := &models.HisPrescriptionProjectTemplate{
+		//	ProjectId:          1750,
+		//	Price:              6.00,
+		//	UserOrgId:          10215,
+		//	Status:             1,
+		//	Ctime:              time.Now().Unix(),
+		//	Mtime:              time.Now().Unix(),
+		//	PatientId:          item.PatientId,
+		//	RecordDate:         0,
+		//	Count:              1,
+		//	FeedetlSn:          "",
+		//	MedListCodg:        "",
+		//	SingleDose:         "1",
+		//	DeliveryWay:        "",
+		//	ExecutionFrequency: "",
+		//	Day:                "1",
+		//	Remark:             "",
+		//	Unit:               "",
+		//	Type:               2,
+		//	PrescriptionId:     info.ID,
+		//	FrequencyType:      1,
+		//	DayCount:           0,
+		//	WeekDay:            "",
+		//}
+		//service.CreateHisPrescriptionProjectTemplate(pro)
+		//
+		//pro2 := &models.HisPrescriptionProjectTemplate{
+		//	ProjectId:          2462,
+		//	Price:              4.94,
+		//	UserOrgId:          10215,
+		//	Status:             1,
+		//	Ctime:              time.Now().Unix(),
+		//	Mtime:              time.Now().Unix(),
+		//	PatientId:          item.PatientId,
+		//	RecordDate:         0,
+		//	Count:              1,
+		//	FeedetlSn:          "",
+		//	MedListCodg:        "",
+		//	SingleDose:         "1",
+		//	DeliveryWay:        "",
+		//	ExecutionFrequency: "",
+		//	Day:                "1",
+		//	Remark:             "",
+		//	Unit:               "",
+		//	Type:               3,
+		//	PrescriptionId:     info.ID,
+		//	FrequencyType:      1,
+		//	DayCount:           0,
+		//	WeekDay:            "",
+		//}
+		//service.CreateHisPrescriptionProjectTemplate(pro2)
 		//
 		//
 		infos, _ := service.GetAllPTInfo(10215, item.ID)
@@ -1857,90 +1842,50 @@ func (c *PublicApiController) Handle10215() {
 
 				for _, ssubItem := range subItem.HisPrescriptionAdviceTemplate {
 
-					if ssubItem.DrugId == 1234 {
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2326,
-							Price:              0.86,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-					}
+					//if ssubItem.DrugId == 1234 {
+					//	pro := &models.HisPrescriptionProjectTemplate{
+					//		ProjectId:          2326,
+					//		Price:              0.86,
+					//		UserOrgId:          ssubItem.UserOrgId,
+					//		Status:             1,
+					//		Ctime:              time.Now().Unix(),
+					//		Mtime:              time.Now().Unix(),
+					//		PatientId:          ssubItem.PatientId,
+					//		RecordDate:         ssubItem.AdviceDate,
+					//		Count:              1,
+					//		FeedetlSn:          "",
+					//		MedListCodg:        "",
+					//		SingleDose:         "1",
+					//		DeliveryWay:        "",
+					//		ExecutionFrequency: "",
+					//		Day:                "1",
+					//		Remark:             "",
+					//		Unit:               "",
+					//		Type:               3,
+					//		PrescriptionId:     info.ID,
+					//		FrequencyType:      ssubItem.FrequencyType,
+					//		DayCount:           ssubItem.DayCount,
+					//		WeekDay:            ssubItem.WeekDay,
+					//	}
+					//	service.CreateHisPrescriptionProjectTemplate(pro)
+					//
+					//}
 					if ssubItem.DrugId == 1288 {
-
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2326,
-							Price:              0.86,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
+						info := &models.HisPrescriptionInfoTemplate{
+							UserOrgId:   item.UserOrgId,
+							RecordDate:  0,
+							PatientId:   item.PatientId,
+							Status:      1,
+							Ctime:       time.Now().Unix(),
+							Mtime:       time.Now().Unix(),
+							Type:        2,
+							Creator:     0,
+							Modifier:    0,
+							PType:       0,
+							PTemplateId: item.ID,
+							MedType:     "14",
 						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-					}
-					if ssubItem.DrugId == 1306 {
-
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2325,
-							Price:              1.11,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
+						service.CreateHisPrescriptionInfoTemplate(info)
 
 						pro2 := &models.HisPrescriptionProjectTemplate{
 							ProjectId:          1727,
@@ -1968,61 +1913,142 @@ func (c *PublicApiController) Handle10215() {
 						}
 						service.CreateHisPrescriptionProjectTemplate(pro2)
 
-					}
-					if ssubItem.DrugId == 1291 {
+						//pro := &models.HisPrescriptionProjectTemplate{
+						//	ProjectId:          2326,
+						//	Price:              0.86,
+						//	UserOrgId:          ssubItem.UserOrgId,
+						//	Status:             1,
+						//	Ctime:              time.Now().Unix(),
+						//	Mtime:              time.Now().Unix(),
+						//	PatientId:          ssubItem.PatientId,
+						//	RecordDate:         ssubItem.AdviceDate,
+						//	Count:              1,
+						//	FeedetlSn:          "",
+						//	MedListCodg:        "",
+						//	SingleDose:         "1",
+						//	DeliveryWay:        "",
+						//	ExecutionFrequency: "",
+						//	Day:                "1",
+						//	Remark:             "",
+						//	Unit:               "",
+						//	Type:               3,
+						//	PrescriptionId:     info.ID,
+						//	FrequencyType:      ssubItem.FrequencyType,
+						//	DayCount:           ssubItem.DayCount,
+						//	WeekDay:            ssubItem.WeekDay,
+						//}
+						//service.CreateHisPrescriptionProjectTemplate(pro)
 
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2322,
-							Price:              0.68,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-						pro2 := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          1727,
-							Price:              2.50,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               2,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro2)
 					}
+					//if ssubItem.DrugId == 1306 {
+					//
+					//	pro := &models.HisPrescriptionProjectTemplate{
+					//		ProjectId:          2325,
+					//		Price:              1.11,
+					//		UserOrgId:          ssubItem.UserOrgId,
+					//		Status:             1,
+					//		Ctime:              time.Now().Unix(),
+					//		Mtime:              time.Now().Unix(),
+					//		PatientId:          ssubItem.PatientId,
+					//		RecordDate:         ssubItem.AdviceDate,
+					//		Count:              1,
+					//		FeedetlSn:          "",
+					//		MedListCodg:        "",
+					//		SingleDose:         "1",
+					//		DeliveryWay:        "",
+					//		ExecutionFrequency: "",
+					//		Day:                "1",
+					//		Remark:             "",
+					//		Unit:               "",
+					//		Type:               3,
+					//		PrescriptionId:     info.ID,
+					//		FrequencyType:      ssubItem.FrequencyType,
+					//		DayCount:           ssubItem.DayCount,
+					//		WeekDay:            ssubItem.WeekDay,
+					//	}
+					//	service.CreateHisPrescriptionProjectTemplate(pro)
+					//
+					//	pro2 := &models.HisPrescriptionProjectTemplate{
+					//		ProjectId:          1727,
+					//		Price:              2.50,
+					//		UserOrgId:          ssubItem.UserOrgId,
+					//		Status:             1,
+					//		Ctime:              time.Now().Unix(),
+					//		Mtime:              time.Now().Unix(),
+					//		PatientId:          ssubItem.PatientId,
+					//		RecordDate:         ssubItem.AdviceDate,
+					//		Count:              1,
+					//		FeedetlSn:          "",
+					//		MedListCodg:        "",
+					//		SingleDose:         "1",
+					//		DeliveryWay:        "",
+					//		ExecutionFrequency: "",
+					//		Day:                "1",
+					//		Remark:             "",
+					//		Unit:               "",
+					//		Type:               2,
+					//		PrescriptionId:     info.ID,
+					//		FrequencyType:      ssubItem.FrequencyType,
+					//		DayCount:           ssubItem.DayCount,
+					//		WeekDay:            ssubItem.WeekDay,
+					//	}
+					//	service.CreateHisPrescriptionProjectTemplate(pro2)
+					//
+					//}
+					//if ssubItem.DrugId == 1291 {
+					//
+					//	pro := &models.HisPrescriptionProjectTemplate{
+					//		ProjectId:          2322,
+					//		Price:              0.68,
+					//		UserOrgId:          ssubItem.UserOrgId,
+					//		Status:             1,
+					//		Ctime:              time.Now().Unix(),
+					//		Mtime:              time.Now().Unix(),
+					//		PatientId:          ssubItem.PatientId,
+					//		RecordDate:         ssubItem.AdviceDate,
+					//		Count:              1,
+					//		FeedetlSn:          "",
+					//		MedListCodg:        "",
+					//		SingleDose:         "1",
+					//		DeliveryWay:        "",
+					//		ExecutionFrequency: "",
+					//		Day:                "1",
+					//		Remark:             "",
+					//		Unit:               "",
+					//		Type:               3,
+					//		PrescriptionId:     info.ID,
+					//		FrequencyType:      ssubItem.FrequencyType,
+					//		DayCount:           ssubItem.DayCount,
+					//		WeekDay:            ssubItem.WeekDay,
+					//	}
+					//	service.CreateHisPrescriptionProjectTemplate(pro)
+					//
+					//	pro2 := &models.HisPrescriptionProjectTemplate{
+					//		ProjectId:          1727,
+					//		Price:              2.50,
+					//		UserOrgId:          ssubItem.UserOrgId,
+					//		Status:             1,
+					//		Ctime:              time.Now().Unix(),
+					//		Mtime:              time.Now().Unix(),
+					//		PatientId:          ssubItem.PatientId,
+					//		RecordDate:         ssubItem.AdviceDate,
+					//		Count:              1,
+					//		FeedetlSn:          "",
+					//		MedListCodg:        "",
+					//		SingleDose:         "1",
+					//		DeliveryWay:        "",
+					//		ExecutionFrequency: "",
+					//		Day:                "1",
+					//		Remark:             "",
+					//		Unit:               "",
+					//		Type:               2,
+					//		PrescriptionId:     info.ID,
+					//		FrequencyType:      ssubItem.FrequencyType,
+					//		DayCount:           ssubItem.DayCount,
+					//		WeekDay:            ssubItem.WeekDay,
+					//	}
+					//	service.CreateHisPrescriptionProjectTemplate(pro2)
+					//}
 				}
 
 			}

models/his_charge_models.go

@@ -1,15 +1,17 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID         int64      `gorm:"column:id" json:"id" form:"id"`
-	ProjectId  int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId  int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status     int64      `gorm:"column:status" json:"status" form:"status"`
-	PatientId  int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count      int64      `gorm:"column:count" json:"count" form:"count"`
-	HisProject HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	GoodInfo   GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	ID         int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId  int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status     int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count      float64 `gorm:"column:count" json:"count" form:"count"`
+	Type       int64   `gorm:"column:type" json:"type" form:"type"`
+
+	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 }
 
 func (HisChargePrescriptionProject) TableName() string {
@@ -22,6 +24,7 @@ type HisChargeDoctorAdviceInfo struct {
 	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	AdviceName string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {
@@ -42,8 +45,8 @@ type HisChargeOrderInfo struct {
 	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
-	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"project"`
-	HisChargeDoctorAdviceInfo    HisChargeDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"advice"`
+	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisChargeDoctorAdviceInfo    HisChargeDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
 }
 
 func (HisChargeOrderInfo) TableName() string {
@@ -56,27 +59,119 @@ type ChargePatient struct {
 	Name           string            `gorm:"column:name" json:"name" form:"name"`
 	Lapseto        int64             `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
 	Status         int64             `gorm:"column:status" json:"status" form:"status"`
-	HisChargeOrder []*HisChargeOrder `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"orders"`
+	HisChargeOrder []*HisChargeOrder `gorm:"ForeignKey:PatientID;AssociationForeignKey:ID" json:"orders"`
 }
 
 func (ChargePatient) TableName() string {
 	return "xt_patients"
 }
 
-type HisChargeOrder struct {
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Status             int64  `gorm:"column:status" json:"status" form:"status"`
-	Number             string `gorm:"column:number" json:"number" form:"number"`
-	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId            string `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+type SettlePatient struct {
+	ID                   int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId            int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                 string                  `gorm:"column:name" json:"name" form:"name"`
+	Lapseto              int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status               int64                   `gorm:"column:status" json:"status" form:"status"`
+	HisChargeSettleOrder []*HisChargeSettleOrder `gorm:"ForeignKey:PatientID;AssociationForeignKey:ID" json:"orders"`
+}
+
+func (SettlePatient) TableName() string {
+	return "xt_patients"
+}
 
-	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"orders"`
+type HisChargeOrder struct {
+	ID                 int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Status             int64                 `gorm:"column:status" json:"status" form:"status"`
+	Number             string                `gorm:"column:number" json:"number" form:"number"`
+	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 }
 
 func (HisChargeOrder) TableName() string {
 	return "his_order"
 }
+
+type HisChargeSettleOrder struct {
+	ID                  int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId        int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate  int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Status              int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId           int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode             int64   `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg             string  `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo              string  `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg              string  `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime         string  `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid         string  `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus         int64   `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId              string  `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	Insutype            string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType             string  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag         string  `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime            string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType       string  `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType             string  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt        float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt     float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay      float64 `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt       float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt         float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc          float64 `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay             float64 `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay          float64 `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay     float64 `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay            float64 `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay            float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay            float64 `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay              float64 `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay              float64 `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt       float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt          float64 `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay             float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay          float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt         float64 `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                float64 `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay       float64 `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId        string  `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins           string  `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay              string  `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType             string  `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail          string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance int64   `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PType               int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	SettleType          int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime     int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime       int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+}
+
+func (HisChargeSettleOrder) TableName() string {
+	return "his_order"
+}
+
+type HisChargeProject struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Unit        string `gorm:"column:unit" json:"unit" form:"unit"`
+}
+
+func (HisChargeProject) TableName() string {
+	return "xt_his_project"
+}
+
+type HisChargeGoodInfo struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit int64  `gorm:"column:good_unit" json:"good_unit"`
+}
+
+func (HisChargeGoodInfo) TableName() string {
+	return "xt_good_information"
+}

models/his_models.go

@@ -749,7 +749,7 @@ type HisPrescriptionProject struct {
 	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64      `gorm:"column:count" json:"count" form:"count"`
+	Count              float64    `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`

service/dialysis_service.go

@@ -1179,7 +1179,7 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1", orgid).Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
 	return goodinfo, err
 }
 

service/his_charge_service.go

@@ -6,25 +6,24 @@ import (
 )
 
 func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
-	err = readDb.Model(&models.ChargePatient{}).Select("id,user_org_id,name,lapseto,status").Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ?", start_time, end_time).
+	err = readDb.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1 ")
-				}).Where("status = 1 ")
-			})
-	}).Where("user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 	return
 }
 
-//func GetAllPatientChargeDetails(org_id int64,start_time int64, end_time int64)(patients []*models.ChargePatient,err error){
-//	err = readDb.Model(&models.ChargePatient{}).Select("id,user_org_id,name,lapseto,status").Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-//		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ?", start_time,end_time).
-//			Preload("HisChargeOrderInfo",  func(db *gorm.DB) *gorm.DB {
-//				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo","status = 1").Preload("HisChargePrescriptionProject",  func(db *gorm.DB) *gorm.DB {
-//					return db.Preload("HisProject","status = 1").Preload("GoodInfo","status = 1").Where("status = 1 ")
-//				}).Where("status = 1 ")
-//			})
-//	}).Where("user_org_id = ? AND status = 1",org_id).Find(&patients).Error
-//	return
-//}
+func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64) (patients []*models.SettlePatient, err error) {
+	err = readDb.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+	return
+}

service/his_hospital_service.go

@@ -80,14 +80,27 @@ func GetHisHospitalPatientList(org_id int64, record_date int64) (patients []*Hos
 	return
 }
 
-func GetHisHospitalSchPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
-	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
-	db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? ", org_id, record_date)
-	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
-	})
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
-	return
+func GetHisHospitalSchPatientList(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
+	if sch_type > 0 {
+		db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+		})
+		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+		return
+
+	} else {
+		db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ?  ", org_id, record_date)
+		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+		})
+		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+		return
+
+	}
+
 }
 
 func GetNewAllUnChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {

service/his_service.go

@@ -1513,7 +1513,7 @@ type HisPrescriptionProject struct {
 	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64        `gorm:"column:count" json:"count" form:"count"`
+	Count              float64      `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`