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

controllers/his_hospital_api_controller.go

@@ -32,6 +32,8 @@ func HisHospitalManagerApiRegistRouters() {
 	beego.Router("/api/hospitaldetail/list", &HisHospitalApiController{}, "get:GetHisHospitalDetailPatientList")
 	beego.Router("/api/hospitaldetail/info", &HisHospitalApiController{}, "get:GetHisHospitalDetailInfo")
 
+	beego.Router("/api/monthhospitaldetail/get", &HisHospitalApiController{}, "get:GetHisHospitalMonthDetailInfo")
+
 }
 
 func (c *HisHospitalApiController) GetHisHospitalPatientList() {
@@ -752,3 +754,41 @@ func (c *HisHospitalApiController) GetHisHospitalDetailInfo() {
 		"his_info":            record,
 	})
 }
+func (c *HisHospitalApiController) GetHisHospitalMonthDetailInfo() {
+	id, _ := c.GetInt64("id")
+	is_upload, _ := c.GetInt64("is_upload")
+	patient_id, _ := c.GetInt64("patient_id")
+	start_time_str := c.GetString("start_time")
+	end_time_str := c.GetString("end_time")
+
+	record, _ := service.GetInHospitalRecord(id)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	adminInfo := c.GetAdminUserInfo()
+	theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordStartTime := theStartTime.Unix()
+	theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordEndTime := theEndTime.Unix()
+	//var prescriptions []*models.HisPrescription
+
+	var monthPrescriptions []*models.HisPrescription
+	if is_upload == 1 {
+		monthPrescriptions, _ = service.GetMonthUnUploadHisHospitalPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
+	} else if is_upload == 2 {
+		monthPrescriptions, _ = service.GetMonthUploadHisHospitalPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
+	} else {
+		monthPrescriptions, _ = service.GetAllMonthHisHospitalPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"month_prescriptions": monthPrescriptions,
+		"his_info":            record,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -546,7 +546,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	var team_projects []*models.HisPrescriptionProject
-	var index int64 = 0
+	//var index int64 = 0
 	for _, item := range temp_team_projects {
 		//组套里面非检验项目的
 		if item.HisProject.CostClassify != 3 {
@@ -554,13 +554,12 @@ func (this *DialysisAPIController) DialysisRecord() {
 		}
 		//组套里面检验项目的
 		if item.HisProject.CostClassify == 3 {
-			index = index + 1
-			if index == 1 {
-				team_projects = append(team_projects, item)
-			}
+			team_projects = append(team_projects, item)
 		}
 	}
 
+	team_projects = RemoveRepeatedCheckRecod(team_projects)
+
 	stockType, _ = service.GetStockType(adminInfo.Org.Id)
 
 	prepare, _ = service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
@@ -5501,6 +5500,7 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 
 		// 删除出库完成后，要改变流水库存
 		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+
 		fmt.Println("erron2332323232323232232323", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
 
@@ -5527,3 +5527,20 @@ func (this *DialysisAPIController) GetMobileScheduleList() {
 	zone_options_visible, _ := this.GetInt64("zone_options_visible")
 	fmt.Println(limit, page, type_options_visible, sch_type_options_visible, zone_options_visible)
 }
+
+func RemoveRepeatedCheckRecod(arr []*models.HisPrescriptionProject) (newArr []*models.HisPrescriptionProject) {
+	newArr = make([]*models.HisPrescriptionProject, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].TeamId == arr[j].TeamId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

service/his_hospital_service.go

@@ -397,3 +397,19 @@ func GetMonthUploadHisHospitalPrescription(org_id int64, patient_id int64, start
 		Find(&prescription).Error
 	return
 }
+
+func GetAllMonthHisHospitalPrescription(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("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND patient_id = ? AND record_date <= ? AND  record_date >= ? AND p_type = 1", org_id, patient_id, end_time, start_time).
+		Find(&prescription).Error
+	return
+}