耗材参数

controllers/dialysis_api_controller.go

@@ -244,8 +244,9 @@ func (c *DialysisApiController) PostPrescription() {
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
 	// var prescription_doctor int64
 	blood := c.GetString("blood")
-	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	//dialysis_irrigation := c.GetString("dialysis_irrigation")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -327,12 +328,77 @@ func (c *DialysisApiController) PostPrescription() {
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
 		Blood:                      blood,
-		//DialysisDialyszers:         dialysis_dialyszers,
-		//DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.CurrentOrgId)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//      }
+	//      }
+	//    }
+	//  }
+	//
+	//}
+
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription.PrescriptionDoctor = appRole.AdminUserId
 	}
@@ -497,8 +563,8 @@ func (c *DialysisApiController) PostSoulution() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
-	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	//dialysis_irrigation := c.GetString("dialysis_irrigation")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
 	var prescription_doctor int64
@@ -591,12 +657,76 @@ func (c *DialysisApiController) PostSoulution() {
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		Blood:                     blood,
-		//DialysisIrrigation:        dialysis_irrigation,
-		//DialysisDialyszers:        dialysis_dialyszers,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		DialysisIrrigation:        dialysis_irrigation,
+		DialysisDialyszers:        dialysis_dialyszers,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
+		DisplaceSpeed:             displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.CurrentOrgId)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -604,7 +734,7 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 
 		prescription.Creater = adminUserInfo.AdminUser.Id
-		//prescription.Creater = adminUserInfo.AdminUser.Id
+
 	} else { //修改
 
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -687,6 +817,8 @@ func (c *DialysisApiController) PostSoulution() {
 		BodyFluidOther:             body_fluid_other,
 		ReplacementTotal:           replacement_total,
 		TargetKtv:                  target_ktv,
+		DialysisIrrigation:         dialysis_irrigation,
+		DialysisDialyszers:         dialysis_dialyszers,
 	}
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	if err == nil {

controllers/gobal_config_api_controller.go

@@ -757,8 +757,11 @@ func (c *GobalConfigApiController) UpdateSystemPrescription() {
 func (c *GobalConfigApiController) GetAllSystemPrescription() {
 	adminUserInfo := c.GetAdminUserInfo()
 	prescriptions, _ := service.FindAllSystemPrescription(adminUserInfo.CurrentOrgId)
+
+	stockType, _ := service.GetStockType(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"prescriptions": prescriptions,
+		"stockType":     stockType,
 	})
 }
 
@@ -990,6 +993,17 @@ func defaultSystemSolutionFormData(solution *models.SystemPrescription, data []b
 		solution.Remark = remark
 	}
 
+	if dataBody["dialysis_dialyszers"] != nil && reflect.TypeOf(dataBody["dialysis_dialyszers"]).String() == "string" {
+		dialysisDialyszers := dataBody["dialysis_dialyszers"].(string)
+		fmt.Println("dialysisDialysis22222222222", dialysisDialyszers)
+		solution.DialysisDialyszers = dialysisDialyszers
+	}
+
+	if dataBody["dialysis_irrigation"] != nil && reflect.TypeOf(dataBody["dialysis_irrigation"]).String() == "string" {
+		dialysisIrrigation := dataBody["dialysis_irrigation"].(string)
+		solution.DialysisIrrigation = dialysisIrrigation
+	}
+
 	return
 }
 

controllers/manager_center_api_controller.go

@@ -1547,6 +1547,11 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		RetailPrice:            retail_price,
 	}
 
+	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id)
+	if totals > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
+		return
+	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -91,6 +91,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
+
 		if err != nil {
 			this.ErrorLog("获取排班信息失败:%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -117,6 +118,7 @@ func (this *DialysisAPIController) Scheduals() {
 		} else {
 
 		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
@@ -1163,6 +1165,71 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DisplaceSpeed:              displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.Org.Id)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if dialysisPrescription.ID == 0 { //新增
 		//if mode_id > 0 {
@@ -2063,8 +2130,75 @@ func (c *DialysisAPIController) PostSolution() {
 		BodyFluidOther:             body_fluid_other,
 		ReplacementTotal:           replacement_total,
 		TargetKtv:                  target_ktv,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
 	}
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
+
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.Org.Id)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solution":     &solution,
 		"prescription": &prescription,
@@ -3053,21 +3187,21 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-				//commdity_code := items["commdity_code"].(string)
-				//fmt.Println("新建22222222222222",commdity_code)
+				commdity_code := items["commdity_code"].(string)
+				fmt.Println("新建22222222222222", commdity_code)
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
-					UserOrgId:  adminUser.Org.Id,
-					PatientId:  patient_id,
-					RecordDate: record_time,
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
-					Creater:    adminUser.AdminUser.Id,
-					Modifier:   0,
-					//CommdityCode:commdity_code,
+					UserOrgId:    adminUser.Org.Id,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					Ctime:        time.Now().Unix(),
+					Mtime:        time.Now().Unix(),
+					Creater:      adminUser.AdminUser.Id,
+					Modifier:     0,
+					CommdityCode: commdity_code,
 				}
 				record_count := service.FindDialysisBeforePrepare(prepare.PatientId, prepare.GoodId, prepare.GoodTypeId, adminUser.Org.Id, record_time)
 				if record_count == 0 {
@@ -3146,22 +3280,22 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 				ctime := int64(items["ctime"].(float64))
 
-				//commdity_code := items["commdity_code"].(string)
-				//fmt.Println("commdityecode22222222222222222222",commdity_code)
+				commdity_code := items["commdity_code"].(string)
+				fmt.Println("commdityecode22222222222222222222", commdity_code)
 				prepare := &models.DialysisBeforePrepare{
-					ID:         id,
-					UserOrgId:  adminUser.Org.Id,
-					PatientId:  patient_id,
-					RecordDate: record_time,
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					Ctime:      ctime,
-					Mtime:      time.Now().Unix(),
-					Creater:    creater,
-					Modifier:   adminUser.AdminUser.Id,
-					Status:     1,
-					//CommdityCode: commdity_code,
+					ID:           id,
+					UserOrgId:    adminUser.Org.Id,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					Ctime:        ctime,
+					Mtime:        time.Now().Unix(),
+					Creater:      creater,
+					Modifier:     adminUser.AdminUser.Id,
+					Status:       1,
+					CommdityCode: commdity_code,
 				}
 				updateBeforePrepares = append(updateBeforePrepares, prepare)
 
@@ -3458,23 +3592,23 @@ func (c *DialysisAPIController) EditConsumables() {
 						return
 					}
 					ctime := int64(items["ctime"].(float64))
-					//commdity_code := items["commdity_code"].(string)
-					//fmt.Println("commdityecode22222222222222222222",commdity_code)
+					commdity_code := items["commdity_code"].(string)
+					fmt.Println("commdityecode22222222222222222222", commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
-						ID:         id,
-						UserOrgId:  adminUser.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     good_id,
-						GoodTypeId: good_type_id,
-						Count:      count,
-						Ctime:      ctime,
-						Mtime:      time.Now().Unix(),
-						Creater:    creater,
-						Modifier:   adminUser.AdminUser.Id,
-						Status:     1,
-						//CommdityCode: commdity_code,
+						ID:           id,
+						UserOrgId:    adminUser.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       good_id,
+						GoodTypeId:   good_type_id,
+						Count:        count,
+						Ctime:        ctime,
+						Mtime:        time.Now().Unix(),
+						Creater:      creater,
+						Modifier:     adminUser.AdminUser.Id,
+						Status:       1,
+						CommdityCode: commdity_code,
 					}
 					beforePrepares = append(beforePrepares, prepare)
 
@@ -4004,6 +4138,9 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 
 	goodTypes, _ := service.FindAllGoodType(adminUser.Org.Id)
 
+	//获取当天该病人的透析处方
+	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
+	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
 	if err == gorm.ErrRecordNotFound {
 
 		dialysisGoods, _, total := service.MobileGetDialysisGoods(adminUser.Org.Id, date.Unix(), schedule_type, partition_id, page, 0, patient_id, "", schedualEndDate)
@@ -4020,6 +4157,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 			"dialysis_goods": dialysisGoods,
 			"good_type":      goodTypes,
 			"total":          total,
+			"prescribe":      prescribe,
+			"good_info":      good_info,
 		})
 		return
 
@@ -4043,6 +4182,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				"dialysis_goods": dialysisGoods,
 				"good_type":      goodTypes,
 				"total":          total,
+				"prescribe":      prescribe,
+				"good_info":      good_info,
 			})
 			return
 
@@ -4109,11 +4250,17 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 
 	goodUser, _ := service.GetAllStockOutUserDetail(patient_id, adminUser.Org.Id, date.Unix())
 	lastGoodUserDetial, _ := service.GetLastDialysisGoods(patient_id, adminUser.Org.Id, date.Unix())
+
+	//获取今日患者的透析处方参数
+
+	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"good_type":      goodTypes,
 		"good_user":      goodUser,
 		"good_info":      good_info,
 		"last_good_user": lastGoodUserDetial,
+		"prescription":   prescribe,
 	})
 	return
 
@@ -4155,15 +4302,16 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				good_id := int64(items["good_id"].(float64))
 
+				good_id := int64(items["good_id"].(float64))
+				fmt.Println("goood_id2222222222222222", good_id)
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
 				good_type_id := int64(items["good_type_id"].(float64))
-
+				fmt.Println("goood_id2222222222222222", good_type_id)
 				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
 					utils.ErrorLog("count")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4171,7 +4319,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+				fmt.Println("count22222222", count)
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					UserOrgId:  adminUser.Org.Id,
@@ -4421,3 +4569,45 @@ func (c *DialysisAPIController) GetDepartment() {
 	}
 
 }
+
+func (c *DialysisAPIController) GetMobilePrintStockGood() {
+
+	types, _ := c.GetInt("type", 0)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, orgId)
+	stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"type":       types,
+			"stockTotal": stockTotal,
+		})
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -137,4 +137,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/department/get", &DialysisAPIController{}, "Get:GetDepartment")
 
+	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
 }

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -43,8 +43,7 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 	unitType, _ := service.GetUnitType(bedid, orgid)
 	//查询使用登记最后一条消毒记录
 	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate, scheduletype)
-	fmt.Println("infomation========", infomation)
-	fmt.Println("err-------", err)
+	fmt.Println("err", err)
 	if err == gorm.ErrRecordNotFound {
 		//查询改设备是否有消毒计划
 		plan, errcode := service.GetDisInfectionTime(orgid, unitType.UnitType, scheduletype, scheduleweek)
@@ -216,3 +215,27 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 		}
 	}
 }
+
+func (this *NewManageApiController) GetDeviceInformation() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+
+	scheduleDate := this.GetString("schedule_date")
+	recordDate, parseErr := utils.ParseTimeStringToTime("2006-01-02", scheduleDate)
+	if parseErr != nil {
+		this.ErrorLog("时间解析失败:%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	fmt.Println("recordDate2222222", recordDate.Unix())
+	//查询今日所有设备使用登记
+	information, err := service.GetDeviceInfomation(orgid, recordDate.Unix())
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+}

controllers/new_mobile_api_controllers/new_manage_api_router.go

@@ -7,4 +7,5 @@ func NewManageApiControllersRegisterRouters() {
 	beego.Router("m/api/getequitautoinfo", &NewManageApiController{}, "Get:GetEquitAutoInfo")
 	beego.Router("m/api/getdisinfection", &NewManageApiController{}, "Get:GetDisInfectionTime")
 	beego.Router("/m/api/savedisinfectioninfo", &NewManageApiController{}, "Get:SaveDisInfectionInfo")
+	beego.Router("/m/api/getdeviceinformation", &NewManageApiController{}, "Get:GetDeviceInformation")
 }

controllers/patient_api_controller.go

@@ -854,6 +854,8 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		BloodAccess:                solution.BloodAccess,
 		DialysateFlow:              solution.DialysateFlow,
 		DialysateTemperature:       solution.DialysateTemperature,
+		DialysisIrrigation:         solution.DialysisIrrigation,
+		DialysisDialyszers:         solution.DialysisDialyszers,
 	}
 	service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	if err != nil {
@@ -926,9 +928,11 @@ func (c *PatientApiController) GetPatientDialysisSolutionList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	solutions, total, _ := service.GetPatientDialysisSolutionList(adminUserInfo.CurrentOrgId, id, page, limit)
+	stockType, _ := service.GetStockType(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solutions": solutions,
 		"total":     total,
+		"stockType": stockType,
 	})
 	return
 }
@@ -3395,6 +3399,17 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 
 		solution.CreatedTime = created_time
 	}
+
+	if dataBody["dialysis_dialyszers"] != nil && reflect.TypeOf(dataBody["dialysis_dialyszers"]).String() == "string" {
+		dialysisDialyszers := dataBody["dialysis_dialyszers"].(string)
+		solution.DialysisDialyszers = dialysisDialyszers
+	}
+
+	if dataBody["dialysis_irrigation"] != nil && reflect.TypeOf(dataBody["dialysis_irrigation"]).String() == "string" {
+		dialysisIrrigation := dataBody["dialysis_irrigation"].(string)
+		solution.DialysisIrrigation = dialysisIrrigation
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

@@ -44,6 +44,8 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getthreeweeklist", &ScheduleApiController{}, "Get:GetThreeWeekList")
 
 	beego.Router("/api/schedule/getallzones", &ScheduleApiController{}, "Get:GetAllZones")
+
+	beego.Router("/api/schedule/copypatientschedules", &ScheduleApiController{}, "Get:GetCopyPatientSchedules")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -1992,3 +1994,127 @@ func (this *ScheduleApiController) GetAllZones() {
 		"zones": zones,
 	})
 }
+
+func (this *ScheduleApiController) GetCopyPatientSchedules() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	copy_startime, _ := this.GetInt64("copy_startime")
+	fmt.Println("copy_startime", copy_startime)
+	copy_endtime, _ := this.GetInt64("copy_endtime")
+
+	//获取本周患者排班
+	schedules, _ := service.GetWeekSchedules(orgId, start_time, end_time)
+
+	//查询复制中的排班日期是否存在
+	_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
+
+	if errcode == gorm.ErrRecordNotFound {
+		//如果没有直接新增
+
+		for _, item := range schedules {
+			//fmt.Println(item.StartTime+604800)
+			//礼拜1
+			if item.ScheduleWeek == 1 {
+				item.ScheduleDate = copy_startime
+			}
+			if item.ScheduleWeek == 2 {
+				item.ScheduleDate = copy_startime + 86400
+			}
+			if item.ScheduleWeek == 3 {
+				item.ScheduleDate = copy_startime + 172800
+			}
+			if item.ScheduleWeek == 4 {
+				item.ScheduleDate = copy_startime + 259200
+			}
+			if item.ScheduleWeek == 5 {
+				item.ScheduleDate = copy_startime + 345600
+			}
+
+			if item.ScheduleWeek == 6 {
+				item.ScheduleDate = copy_startime + 432000
+			}
+			//礼拜天
+			if item.ScheduleWeek == 0 {
+				item.ScheduleDate = copy_endtime
+			}
+			schedule := models.XtSchedule{
+				UserOrgId:    item.UserOrgId,
+				PartitionId:  item.PartitionId,
+				BedId:        item.BedId,
+				PatientId:    item.PatientId,
+				ScheduleDate: item.ScheduleDate,
+				ScheduleType: item.ScheduleType,
+				ScheduleWeek: item.ScheduleWeek,
+				ModeId:       item.ModeId,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+			}
+
+			err := service.AddPatientSchedule(&schedule)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": schedule,
+			})
+		}
+	} else if errcode == nil {
+
+		//先清除复制周的排班
+		errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+		fmt.Println(errcode)
+		for _, item := range schedules {
+			//fmt.Println(item.StartTime+604800)
+			//礼拜1
+			if item.ScheduleWeek == 1 {
+				item.ScheduleDate = copy_startime
+			}
+			if item.ScheduleWeek == 2 {
+				item.ScheduleDate = copy_startime + 86400
+			}
+			if item.ScheduleWeek == 3 {
+				item.ScheduleDate = copy_startime + 172800
+			}
+			if item.ScheduleWeek == 4 {
+				item.ScheduleDate = copy_startime + 259200
+			}
+			if item.ScheduleWeek == 5 {
+				item.ScheduleDate = copy_startime + 345600
+			}
+
+			if item.ScheduleWeek == 6 {
+				item.ScheduleDate = copy_startime + 432000
+			}
+			//礼拜天
+			if item.ScheduleWeek == 0 {
+				item.ScheduleDate = copy_endtime
+			}
+			schedule := models.XtSchedule{
+				UserOrgId:    item.UserOrgId,
+				PartitionId:  item.PartitionId,
+				BedId:        item.BedId,
+				PatientId:    item.PatientId,
+				ScheduleDate: item.ScheduleDate,
+				ScheduleType: item.ScheduleType,
+				ScheduleWeek: item.ScheduleWeek,
+				ModeId:       item.ModeId,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+			}
+
+			err := service.AddPatientSchedule(&schedule)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": schedule,
+			})
+		}
+	}
+}

controllers/stock_good_api_controller.go

@@ -51,6 +51,7 @@ func (c *StockGoodApiController) CreateGoodType() {
 	total := service.FindAllGoodTypeTotal(adminUserInfo.CurrentOrgId)
 	code := strconv.FormatInt(total+1, 10)
 	code = "34000000" + code
+
 	goodType := models.GoodsType{
 		TypeCode:       code,
 		TypeName:       type_name,

models/dialysis.go

@@ -355,6 +355,8 @@ type DoctorAdvices struct {
 	AnticoagulantShouji        float64         `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
 	AnticoagulantWeichi        float64         `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
 	AnticoagulantZongliang     float64         `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	DialysisDialyszers         string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string          `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 type DoctorAdvice struct {

models/gobal_models.go

@@ -82,6 +82,8 @@ type SystemPrescription struct {
 	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (SystemPrescription) TableName() string {

models/patient_models.go

@@ -246,6 +246,8 @@ type DialysisPrescriptionList struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
 	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
 	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -325,6 +327,8 @@ type DialysisSolution struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisSolution) TableName() string {

models/user_models.go

@@ -335,6 +335,8 @@ type XtDialysisSolution struct {
 	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (XtDialysisSolution) TableName() string {

service/dialysis_service.go

@@ -1148,3 +1148,28 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 	err = writeDb.Save(&advice).Error
 	return
 }
+
+func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1", orgid).Find(&goodinfo).Error
+	return goodinfo, err
+}
+
+func GetDialysisBeforePrepare(goodTypeId int64, goodId int64, orgid int64, patientId int64) (*models.DialysisBeforePrepare, error) {
+
+	prepare := models.DialysisBeforePrepare{}
+	err := XTReadDB().Where("good_type_id = ? and good_id = ? and user_org_id = ? and status =1 and patient_id = ?", goodTypeId, goodId, orgid, patientId).Last(&prepare).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &prepare, nil
+}
+
+func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error {
+
+	err := XTReadDB().Create(&prepare).Error
+	return err
+}

service/gobal_config_service.go

@@ -354,3 +354,44 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 
 	return cancel, total, err
 }
+
+func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, orgId int64) (list []*models.StockInfo, err error) {
+
+	db := XTReadDB().Model(&models.StockInfo{})
+	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
+	if types == 1 {
+		db = db.Joins("JOIN xt_warehouse_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId).Joins("JOIN xt_warehouse AS warehouse ON warehouse.id = xt_warehouse_info.warehousing_id AND warehouse.status = 1 AND warehouse.warehousing_time >=? AND warehouse.warehousing_time<= ? AND warehouse.org_id = ?", startTime, end_time, orgId)
+		})
+	} else if types == 2 {
+		db = db.Joins("JOIN xt_sales_return_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QuerySalesReturnInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_sales_return_info.org_id = ? AND xt_sales_return_info.status = 1", orgId).Joins("JOIN xt_sales_return AS sales ON sales.id = xt_sales_return_info.sales_return_id AND sales.status = 1 AND sales.return_time >=? AND sales.return_time<= ? AND sales.org_id = ?", startTime, end_time, orgId)
+		})
+
+	} else if types == 3 {
+		db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgId).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.org_id = ? ", startTime, end_time, orgId)
+		})
+
+	} else if types == 4 {
+
+		db = db.Joins("JOIN xt_cancel_stock_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryCancelStockInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId).Joins("JOIN xt_cancel_stock AS cancel ON cancel.id = xt_cancel_stock_info.cancel_stock_id AND cancel.status = 1 AND cancel.return_time >=? AND cancel.return_time<= ? AND cancel.org_id = ?", startTime, end_time, orgId)
+		})
+
+	}
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
+	err = db.Order("ctime desc").Find(&list).Error
+	return
+}
+
+func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+}

service/manage_service.go

@@ -1236,3 +1236,9 @@ func DeleteEquit(id int64) (models.DeviceAddmacher, error) {
 	err := UserWriteDB().Model(&addmacher).Where("id=?", id).Updates(map[string]interface{}{"status": 0}).Error
 	return addmacher, err
 }
+
+func GetDeviceInfomation(orgid int64, scheduledate int64) (information []*models.DeviceInformation, err error) {
+
+	err = UserReadDB().Model(&information).Where("user_org_id = ? and date = ? and status =1", orgid, scheduledate).Find(&information).Error
+	return information, err
+}

service/patient_service.go

@@ -1476,6 +1476,6 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
 	return err
 }

service/patientmanage_service.go

@@ -527,7 +527,7 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 		db = db.Where("x.start_time<=?", end)
 	}
 	//offset := (page - 1) * limit
-	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
+	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang,s.dialysis_dialyszers,s.dialysis_irrigation, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
 	fmt.Print("err", err)
 	return
 
@@ -562,7 +562,7 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("x.start_time<=?", end)
 	}
 	offset := (page - 1) * limit
-	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Scan(&doctoradvice).Error
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang,s.dialysis_dialyszers,s.dialysis_irrigation, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Scan(&doctoradvice).Error
 	fmt.Print("错误是什么", err)
 	return
 }
@@ -654,7 +654,7 @@ func GetlongDialysisrecord(patientid int64, startime int64, endtime int64, limit
 	}
 	offset := (page - 1) * limit
 	err = db.Count(&total).Order("x.created_time desc").Offset(offset).Limit(limit).Group("x.id").
-		Select("x.id,x.name,x.sub_name,x.user_org_id,x.patient_id,x.parent_id,x.type,x.period,x.times,x.anticoagulant,x.anticoagulant_shouji,x.anticoagulant_weichi,x.anticoagulant_zongliang,x.anticoagulant_gaimingcheng,x.anticoagulant_gaijiliang,x.mode_name,x.mode_id,x.dialysis_duration,x.replacement_way,x.hemodialysis_machine,x.blood_filter,x.perfusion_apparatus,x.blood_flow_volume,x.dewater,x.displace_liqui,x.glucose,x.dry_weight,x.dialysate_flow,x.kalium,x.sodium,x.calcium,x.bicarbonate,x.doctor,x.first_dialysis,x.remark,x.initiate_mode,x.affirm_state,x.use_state,x.status,x.registrars_id,x.created_time,x.updated_time,x.solution_type,x.dialysate_temperature,x.conductivity,x.dialysis_duration_hour,x.dialysis_duration_minute,x.target_ultrafiltration,x.dialysate_formulation,x.dialyzer,x.replacement_total,x.dialyzer_perfusion_apparatus,x.body_fluid,x.special_medicine,x.special_medicine_other,x.displace_liqui_part,x.displace_liqui_value,x.blood_access,x.ultrafiltration,x.body_fluid_other,x.target_ktv").Find(&prescription).Error
+		Select("x.id,x.name,x.sub_name,x.user_org_id,x.patient_id,x.parent_id,x.type,x.period,x.times,x.anticoagulant,x.anticoagulant_shouji,x.anticoagulant_weichi,x.anticoagulant_zongliang,x.anticoagulant_gaimingcheng,x.anticoagulant_gaijiliang,x.mode_name,x.mode_id,x.dialysis_duration,x.replacement_way,x.hemodialysis_machine,x.blood_filter,x.perfusion_apparatus,x.blood_flow_volume,x.dewater,x.displace_liqui,x.glucose,x.dry_weight,x.dialysate_flow,x.kalium,x.sodium,x.calcium,x.bicarbonate,x.doctor,x.first_dialysis,x.remark,x.initiate_mode,x.affirm_state,x.use_state,x.status,x.registrars_id,x.created_time,x.updated_time,x.solution_type,x.dialysate_temperature,x.conductivity,x.dialysis_duration_hour,x.dialysis_duration_minute,x.target_ultrafiltration,x.dialysate_formulation,x.dialyzer,x.replacement_total,x.dialyzer_perfusion_apparatus,x.body_fluid,x.special_medicine,x.special_medicine_other,x.displace_liqui_part,x.displace_liqui_value,x.blood_access,x.ultrafiltration,x.body_fluid_other,x.target_ktv,x.dialysis_dialyszers,x.dialysis_irrigation").Find(&prescription).Error
 
 	return
 }

service/schedule_service.go

@@ -719,3 +719,33 @@ func UpdatedDialysisPrescription(prescription *models.DialysisPrescription, reco
 	err := XTWriteDB().Model(&prescription).Where("record_date = ? and patient_id = ? and user_org_id = ?", recordDate, patientid, orgid).Update(map[string]interface{}{"mode_id": prescription.ModeId, "updated_time": time.Now().Unix()}).Error
 	return err
 }
+
+func GetWeekSchedules(orgid int64, startime int64, endtime int64) (scheudle []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Model(&scheudle).Where("user_org_id = ? and status = 1 and schedule_date>=? and schedule_date<=?", orgid, startime, endtime).Find(&scheudle).Error
+	return scheudle, err
+}
+
+func GetLastWeekSchedule(orgid int64, startime int64, endtime int64) (*models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Where("user_org_id = ? and status =1 and schedule_date>=? and schedule_date<=?", orgid, startime, endtime).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+func AddPatientSchedule(schedule *models.XtSchedule) error {
+
+	err := XTWriteDB().Create(&schedule).Error
+	return err
+}
+
+func UpdatePatientSchedule(orgid int64, startime int64, endtime int64) error {
+
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&schedule).Where("user_org_id = ? and schedule_date>=? and schedule_date<=? and status =1", orgid, startime, endtime).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/stock_service.go

@@ -121,6 +121,30 @@ func FindAllGoodTypeTotal(orgId int64) (total int64) {
 	return
 }
 
+func GetGoodsTypeIsExist(orgid int64) (*models.GoodsType, error) {
+	goodsType := models.GoodsType{}
+	err := XTReadDB().Where("org_id = ? and stock_attribute = 2 and status =1", orgid).Find(&goodsType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodsType, nil
+}
+
+func GetGoodsTypeIsExistOne(orgid int64) (*models.GoodsType, error) {
+	goodsType := models.GoodsType{}
+	err := XTReadDB().Where("org_id = ? and stock_attribute = 3 and status = 1", orgid).Find(&goodsType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodsType, nil
+}
+
 func AddSigleGoodType(goodType *models.GoodsType) (error, *models.GoodsType) {
 	err := writeDb.Create(&goodType).Error
 	return err, goodType
@@ -233,7 +257,7 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Where("good_code LIKE ? OR specification_name LIKE ?", likeKey, likeKey)
+		db = db.Where("good_code LIKE ? OR good_name LIKE ?", likeKey, likeKey)
 	} else {
 		if is_use > 0 {
 			if is_use == 1 {
@@ -1940,6 +1964,11 @@ func FindGoodInfoByName(name string, org_id int64, good_type_id int64) (total in
 	return
 }
 
+func FindGoodInfoByNameOne(name string, org_id int64, good_type_id int64, id int64) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and id <> ? ", org_id, name, good_type_id, id).Count(&total)
+	return
+}
+
 func FindAllGoodTypeByType(types int64) (goodType []*models.GoodsType, err error) {
 	err = readDb.Model(&models.GoodsType{}).Where("type = ? AND status = 1", types).Find(&goodType).Error
 	return goodType, err