11月8日库存管理

controllers/dialysis_api_controller.go

@@ -64,6 +64,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/queue/update", &DialysisApiController{}, "Get:UpdateQueueCall")
 
 	beego.Router("/api/get/getrolelist", &DialysisApiController{}, "Get:GetRoleList")
+
+	beego.Router("/api/getinitprintdata", &DialysisApiController{}, "Get:GetInitPrintData")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3749,6 +3751,8 @@ func (c *DialysisApiController) GetDialysisGoods() {
 
 	patient_id, _ := c.GetInt64("patient_id")
 
+	good_type, _ := c.GetInt64("good_type")
+
 	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
 	if parseDateErr != nil && len(schedualDate) != 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3771,10 +3775,14 @@ func (c *DialysisApiController) GetDialysisGoods() {
 	goodTypes, _ := service.FindAllGoodType(adminUser.CurrentOrgId)
 
 	if err == gorm.ErrRecordNotFound {
+		list, _ := service.GetDialysisGood(adminUser.CurrentOrgId, date.Unix())
+		var ids []int64
+		for _, item := range list {
+			ids = append(ids, item.PatientId)
+		}
 
-		dialysisGoods, _, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate)
+		dialysisGoods, _, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate, good_type, ids)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
-
 			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			item.LastAutomaticReduceDetail = goodUser
@@ -3789,7 +3797,13 @@ func (c *DialysisApiController) GetDialysisGoods() {
 
 	} else if err == nil {
 		//获取当天排班的每个患者的库存使用情况
-		dialysisGoods, err, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate)
+		list, _ := service.GetDialysisGood(adminUser.CurrentOrgId, date.Unix())
+		var ids []int64
+		for _, item := range list {
+			ids = append(ids, item.PatientId)
+		}
+
+		dialysisGoods, err, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate, good_type, ids)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
 			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.CurrentOrgId, date.Unix())
@@ -3873,3 +3887,21 @@ func (c *DialysisApiController) GetRoleList() {
 		return
 	}
 }
+
+func (c *DialysisApiController) GetInitPrintData() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date, _ := c.GetInt64("record_date")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetInitPrintData(patient_id, record_date, orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}