11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/dialysis_record_api_controller.go

@@ -77,7 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	patients, _ := service.GetAllPcPatientListByListSeven(orgID)
+	patients, _ := service.GetAllPcPatientListByListEight(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -277,6 +277,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	go func() {
 		doctorAdvices, _ = service.MobileGetDoctorAdvices(adminInfo.CurrentOrgId, patientID, date.Unix())
+
 		ch <- struct{}{}
 	}()
 
@@ -388,13 +389,6 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	dialysisSolution, _ := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
-	//
-	//if getDialysisSolutionErr != nil {
-	//	this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
-
 	lastDialysisPrescribe, _ := service.GetLastDialysisPrescribeByModeId(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
 	systemDialysisPrescribe, _ := service.GetSystemDialysisPrescribeByModeId(adminInfo.CurrentOrgId, schedual.ModeId)
@@ -409,10 +403,15 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.CurrentOrgId, adminInfo.CurrentAppId, models.SpecialPermissionTypeHeadNurse)
 
 	var his_advices []*models.HisDoctorAdviceInfo
-	fmt.Println("hhh2333223322323223", is_open_config.IsOpen)
+
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
+	//查询是否是开起
+	adviceConfig, _ := service.FindAdviceSettingById(adminInfo.CurrentOrgId)
+	if adviceConfig.IsAdviceOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	}
 
 	_, errcode := service.GetOrgFollowIsExist(adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -447,6 +446,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"prepare":                     prepare,
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
+			"is_advice_open":              adviceConfig,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -482,6 +482,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"prepare":                     prepare,
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
+			"is_advice_open":              adviceConfig,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/his_api_controller.go

@@ -1869,16 +1869,17 @@ func (c *HisApiController) DeletePrescription() {
 					total, _ := service.FindAllCancelStockTotal(c.GetAdminUserInfo().CurrentOrgId)
 					total = total + 1
 					orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+					houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 					cancelStock := models.CancelStock{
-						OrderNumber: orderNumber,
-						OperaTime:   operation_time,
-						OrgId:       c.GetAdminUserInfo().CurrentOrgId,
-						Creater:     creater,
-						Ctime:       time.Now().Unix(),
-						Status:      1,
-						ReturnTime:  item.RecordDate,
-						Type:        1,
+						OrderNumber:  orderNumber,
+						OperaTime:    operation_time,
+						OrgId:        c.GetAdminUserInfo().CurrentOrgId,
+						Creater:      creater,
+						Ctime:        time.Now().Unix(),
+						Status:       1,
+						ReturnTime:   item.RecordDate,
+						Type:         1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 					_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(item.RecordDate, c.GetAdminUserInfo().CurrentOrgId)
 					if msgerrkonde == gorm.ErrRecordNotFound {
@@ -1914,6 +1915,7 @@ func (c *HisApiController) DeletePrescription() {
 							WarehouseInfoId: info.WarehouseInfotId,
 							PatientId:       info.PatientId,
 							RecordDate:      info.SysRecordTime,
+							StorehouseId:    houseConfig.StorehouseOutInfo,
 						}
 
 						service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -1950,6 +1952,7 @@ func (c *HisApiController) DeletePrescription() {
 							CancelOutDetailId:       cancelInfo.ID,
 							ProductDate:             info.ProductDate,
 							ExpireDate:              info.ExpiryDate,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						service.CreateStockFlowOne(flow)
 
@@ -2002,6 +2005,7 @@ func (c *HisApiController) DeletePrescription() {
 									Manufacturer:            0,
 									Type:                    1,
 									IsSys:                   1,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
 								}
 								err := service.AddSigleWarehouseOut(&warehouseOut)
 								if err != nil {
@@ -2009,24 +2013,26 @@ func (c *HisApiController) DeletePrescription() {
 									return
 								}
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 							} else if err == nil {
 
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
@@ -2087,7 +2093,7 @@ func (c *HisApiController) DeletePrescription() {
 						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
 						total = total + 1
 						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 						cancelStock := models.DrugCancelStock{
 							OrderNumber:  orderNumber,
 							OperaTime:    operation_time,
@@ -2099,6 +2105,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2127,6 +2134,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2162,6 +2170,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2171,6 +2180,7 @@ func (c *HisApiController) DeletePrescription() {
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
 					} else {
+						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 						floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
 
 						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
@@ -2205,6 +2215,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2234,6 +2245,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2270,6 +2282,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2350,7 +2363,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
 						total = total + 1
 						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 						cancelStock := models.DrugCancelStock{
 							OrderNumber:  orderNumber,
 							OperaTime:    operation_time,
@@ -2362,6 +2375,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2390,6 +2404,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2425,6 +2440,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2434,7 +2450,8 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 					} else {
-
+						adminUserInfo := c.GetAdminUserInfo()
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
 
 						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
@@ -2447,7 +2464,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 
 						}
 
-						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
 
@@ -2469,6 +2485,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2497,6 +2514,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2532,6 +2550,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2574,6 +2593,7 @@ func (c *HisApiController) DeleteProject() {
 			fmt.Println(err)
 		}
 		if project.Type == 3 {
+			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
 			good.Total = good.Total + f_count
@@ -2589,14 +2609,15 @@ func (c *HisApiController) DeleteProject() {
 			orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 			cancelStock := models.CancelStock{
-				OrderNumber: orderNumber,
-				OperaTime:   operation_time,
-				OrgId:       adminInfo.CurrentOrgId,
-				Creater:     creater,
-				Ctime:       time.Now().Unix(),
-				Status:      1,
-				ReturnTime:  project.RecordDate,
-				Type:        1,
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        adminInfo.CurrentOrgId,
+				Creater:      creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   project.RecordDate,
+				Type:         1,
+				StorehouseId: houseConfig.StorehouseOutInfo,
 			}
 			_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(project.RecordDate, adminInfo.CurrentOrgId)
 			if msgerrkonde == gorm.ErrRecordNotFound {
@@ -2633,6 +2654,7 @@ func (c *HisApiController) DeleteProject() {
 					WarehouseInfoId: info.WarehouseInfotId,
 					PatientId:       info.PatientId,
 					RecordDate:      info.SysRecordTime,
+					StorehouseId:    houseConfig.StorehouseOutInfo,
 				}
 
 				service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -2669,6 +2691,7 @@ func (c *HisApiController) DeleteProject() {
 					CancelOutDetailId:       cancelInfo.ID,
 					ProductDate:             info.ProductDate,
 					ExpireDate:              info.ExpiryDate,
+					StorehouseId:            houseConfig.StorehouseOutInfo,
 				}
 				service.CreateStockFlowOne(flow)
 
@@ -2721,6 +2744,7 @@ func (c *HisApiController) DeleteProject() {
 							Manufacturer:            0,
 							Type:                    1,
 							IsSys:                   1,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						err := service.AddSigleWarehouseOut(&warehouseOut)
 						if err != nil {
@@ -2728,23 +2752,25 @@ func (c *HisApiController) DeleteProject() {
 							return
 						}
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 					} else if err == nil {
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)

controllers/his_project_api_controller.go

@@ -1117,6 +1117,9 @@ func (this *HisProjectApiController) GetPatientcaseHistory() {
 	history, _ := service.GetPatientCaseHistory(patient_id)
 	hispatient, _ := service.GetHisPatientById(patient_id)
 
+	//获取患者最后一次的血管通路
+	accessList, _ := service.GetPatientVascularAccess(patient_id)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
@@ -1125,6 +1128,7 @@ func (this *HisProjectApiController) GetPatientcaseHistory() {
 		"patient":    patient,
 		"history":    history,
 		"hispatient": hispatient,
+		"accessList": accessList,
 	})
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -197,20 +197,6 @@ func (this *DialysisAPIController) Scheduals() {
 				project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 			}
 
-			//获取今日透析准备的数据
-			//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
-
-			//list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
-
-			//autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
-			//for _, item := range goodList {
-			//	for _, it := range list {
-			//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-			//			item.Children = append(item.Children, it)
-			//		}
-			//	}
-			//}
-			//fmt.Println("goodlist888888888888888888888", goodList, err)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
 				"project":   project,
@@ -580,19 +566,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
 
-	//获取今日透析准备的数据
-	//goodList, _ := service.MobileGetDialysisGoodsSeven(adminInfo.Org.Id, date.Unix())
-	//list, _ := service.MobileGetDialysisGoodsSix(adminInfo.Org.Id, date.Unix())
-	//
-	//autoList, _ := service.GetMobileAutoReduce(adminInfo.Org.Id, date.Unix())
-	//for _, item := range goodList {
-	//	for _, it := range list {
-	//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-	//			item.Children = append(item.Children, it)
-	//		}
-	//	}
-	//}
-
+	is_advice_open, _ := service.FindAdviceSettingById(adminInfo.Org.Id)
+	if is_advice_open.IsAdviceOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+	}
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -623,8 +600,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
 		"team_projects":                  team_projects,
-		//"goodList":                       goodList,
-		//"autoList":                       autoList,
+		"is_advice_open":                 is_advice_open,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -3277,6 +3253,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.Org.Id)
 	_, hisConfig := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
+	is_advice_open, _ := service.FindAdviceSettingById(adminUserInfo.Org.Id)
 	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
 	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3358,6 +3335,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 				"advices_two":     RemoveRepeatedElement(advice_three),
 				"is_open_remind":  config.IsOpenRemind,
 				"his_config_open": hisConfig.IsOpen,
+				"is_advice_open":  is_advice_open.IsAdviceOpen,
 			})
 		}
 	}

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -53,8 +53,7 @@ type MobileBaseAPIAuthController struct {
 func (this *MobileBaseAPIAuthController) Prepare() {
 	token := this.Ctx.GetCookie("token_cookie")
 	logout_cookie := this.Ctx.GetCookie("logout_cookie")
-	fmt.Println("token232232232323232332232332323322332232323", token)
-	fmt.Println("login232232232323232332232332323322332232323", logout_cookie)
+
 	//if len(token) == 0{
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 	//	this.StopRun()
@@ -70,6 +69,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLogOut)
 			this.StopRun()
 		} else {
+
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
 			this.StopRun()
 		}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -628,6 +628,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//清空key 值
 			redis.Set(key, "", time.Second)
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -648,6 +649,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -23,6 +23,7 @@ type NewLoginApiController struct {
 
 func (this *NewLoginApiController) GetLogin() {
 	token_cookie := this.Ctx.GetCookie("token_cookie")
+
 	if len(token_cookie) == 0 {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"isLogin": false,

controllers/patient_api_controller.go

@@ -735,7 +735,11 @@ func (c *PatientApiController) EditLapseto() {
 	err = service.EditPatientLapseto(&patient, &lapseto)
 
 	if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
-		service.UpdateScheduleByDeathTime(id, lapsetoTimeUnix.Unix())
+		timeStr := time.Now().Format("2006-01-02")
+		timeLayout := "2006-01-02 15:04:05"
+		timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+		timenow := timeStringToTime.Unix()
+		service.UpdateScheduleByDeathTime(id, timenow)
 		service.UpdateScheduleItemByPatientId(id)
 	}
 

controllers/schedule_api_controller.go

@@ -1894,7 +1894,16 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				for _, item := range schedules {
 					service.CreateScheduleTemplate(item)
 				}
-
+				//查询已经转出或者死亡的患者
+				patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
+				for _, it := range patientList {
+					timeStr := time.Now().Format("2006-01-02")
+					timeLayout := "2006-01-02 15:04:05"
+					timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+					timenow := timeStringToTime.Unix()
+					service.UpdateScheduleByDeathTime(it.ID, timenow)
+					service.UpdateScheduleItemByPatientId(it.ID)
+				}
 				log := models.ExportLog{
 					LogType:    3,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2217,6 +2226,16 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 		}
 
 		err := service.AddPatientSchedule(&schedule)
+		patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
+		for _, it := range patientList {
+			timeStr := time.Now().Format("2006-01-02")
+			timeLayout := "2006-01-02 15:04:05"
+			timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+			timenow := timeStringToTime.Unix()
+			service.UpdateScheduleByDeathTime(it.ID, timenow)
+			service.UpdateScheduleItemByPatientId(it.ID)
+		}
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

service/dialysis_service.go

@@ -1433,6 +1433,13 @@ func GetAllPcPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVM
 	return patients, err
 }
 
+func GetAllPcPatientListByListEight(orgID int64) (patients []*MSchedualPatientVMList, err error) {
+
+	err = readDb.Where("user_org_id=? and status=1", orgID).Find(&patients).Error
+
+	return patients, err
+}
+
 func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/his_project_service.go

@@ -758,3 +758,9 @@ func GetNewAdminUserES(orgID int64) (es []*models.AdminUserElectronicSignature,
 	err = readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=?  and status=1", orgID).Find(&es).Error
 	return
 }
+
+func GetPatientVascularAccess(patient_id int64) (models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err = XTReadDB().Where("patient_id = ? and status = 1", patient_id).Last(&access).Error
+	return access, err
+}

service/schedule_service.go

@@ -1154,3 +1154,9 @@ func GetSolutionScheduleBySchedule(orgid int64, zonid int64, classtype int64, sc
 	}).Find(&schedule).Error
 	return schedule, err
 }
+
+func GetDeathPatient(orgid int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and (lapseto = 2 || lapseto = 3) and status = 1", orgid).Find(&patient).Error
+	return patient, err
+}

service/self_drug_service.go

@@ -547,6 +547,10 @@ type Drugs struct {
 	HospApprFlag          int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	PrescribingNumberUnit string   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	MinNumber             int64    `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose                  float64  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string   `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MaxUnit               string   `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 }
 
 func (Drugs) TableName() string {