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

controllers/dialysis_api_controller.go

@@ -2364,6 +2364,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 	befor_symptoms := c.GetString("befor_symptoms")
 
+	warsh_count := c.GetString("warsh_count")
+
+	washing_time := c.GetString("washing_time")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -2444,6 +2448,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		WhetherUnobstructed:            whether_unobstructed,
 		LienNecessary:                  lien_necessary,
 		BeforSymptoms:                  befor_symptoms,
+		WarshCount:                     warsh_count,
+		WashingTime:                    washing_time,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/manage_api_controller.go

@@ -4604,6 +4604,8 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 
 	last_creator := int64(dataBody["last_creator"].(float64))
 
+	storey := dataBody["storey"].(string)
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	disinfect := models.XtNewAriDisinfect{
 		UserOrgId:                  orgId,
@@ -4644,6 +4646,7 @@ func (this *MachineApiController) SaveNewAirDisInfect() {
 		Ctime:                      time.Now().Unix(),
 		Mtime:                      time.Now().Unix(),
 		Status:                     1,
+		Storey:                     storey,
 	}
 
 	err = service.CreateNewAirDisinfect(disinfect)
@@ -4665,6 +4668,7 @@ func (this *MachineApiController) GetNewAirDisinfectList() {
 	end_time := this.GetString("end_time")
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
+	storey := this.GetString("storey")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -4685,7 +4689,7 @@ func (this *MachineApiController) GetNewAirDisinfectList() {
 		endTime = theTime.Unix()
 	}
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, total, err := service.GetNewAirDisinfectList(limit, page, startTime, endTime, orgId)
+	list, total, err := service.GetNewAirDisinfectList(limit, page, startTime, endTime, orgId, storey)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -4832,6 +4836,8 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 
 	last_creator := int64(dataBody["last_creator"].(float64))
 
+	storey := dataBody["storey"].(string)
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	disinfect := models.XtNewAriDisinfect{
 		ID:                         id,
@@ -4873,6 +4879,7 @@ func (this *MachineApiController) UpdateNewAirDisInfect() {
 		Ctime:                      time.Now().Unix(),
 		Mtime:                      time.Now().Unix(),
 		Status:                     1,
+		Storey:                     storey,
 	}
 
 	err = service.SaveNewAriDisinfect(disinfect)
@@ -5045,6 +5052,8 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 
 	last_creator := int64(dataBody["last_creator"].(float64))
 
+	storey := dataBody["storey"].(string)
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	objectDisinfect := models.XtNewObjectDisinfect{
@@ -5098,6 +5107,7 @@ func (this *MachineApiController) SaveObjTableDisInfect() {
 		LastDisinfectionWater:      last_disinfection_water,
 		LastDisinfectionMethods:    last_disinfection_methods,
 		LastDisinfectionTime:       last_disinfection_time,
+		Storey:                     storey,
 	}
 
 	err = service.CreateObjectDisInfect(objectDisinfect)
@@ -5119,6 +5129,7 @@ func (this *MachineApiController) GetObjectTableDisinfectList() {
 	end_time := this.GetString("end_time")
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
+	storey := this.GetString("storey")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -5139,7 +5150,7 @@ func (this *MachineApiController) GetObjectTableDisinfectList() {
 		endTime = theTime.Unix()
 	}
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, total, err := service.GetObjectTableDisinfectList(limit, page, startTime, endTime, orgId)
+	list, total, err := service.GetObjectTableDisinfectList(limit, page, startTime, endTime, orgId, storey)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
@@ -5309,6 +5320,8 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 
 	last_creator := int64(dataBody["last_creator"].(float64))
 
+	storey := dataBody["storey"].(string)
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	objectDisinfect := models.XtNewObjectDisinfect{
@@ -5363,6 +5376,7 @@ func (this *MachineApiController) UpdateObjectTableDisinfect() {
 		LastDisinfectionWater:      last_disinfection_water,
 		LastDisinfectionMethods:    last_disinfection_methods,
 		LastDisinfectionTime:       last_disinfection_time,
+		Storey:                     storey,
 	}
 	err = service.UpdateObjectTableDisinfect(objectDisinfect)
 	if err != nil {
@@ -5392,7 +5406,8 @@ func (this *MachineApiController) GetAirDisinfectionLongTime() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	list, err := service.GetAirDisInfectionLongTime(orgId)
+	storey := this.GetString("storey")
+	list, err := service.GetAirDisInfectionLongTime(orgId, storey)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3381,7 +3381,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 
 			//针对
-			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 {
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10460 || adminUserInfo.Org.Id == 10551 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -4392,7 +4392,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10460 {
+			if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10551 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
@@ -4442,7 +4442,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
-	if adminInfo.Org.Id == 10460 {
+	if adminInfo.Org.Id == 10460 || adminInfo.Org.Id == 10551 {
 
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
@@ -9826,7 +9826,7 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 
 	//查询当前护士的患者
-	orderList, _ := service.GetDialysisOrderNoExecution(admin_user_id, orgId)
+	orderList, _ := service.GetDialysisOrderNoExecution(admin_user_id, orgId, timenow)
 	var patientIds []int64
 
 	for _, item := range orderList {
@@ -9836,12 +9836,14 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 	adviceList, _ := service.GetAdviceListNoExecution(timenow, orgId, patientIds)
 
 	hisAdviceList, _ := service.GetHisAdviceListNoExecution(timenow, orgId, patientIds)
-	fmt.Println("hisAdviceList", hisAdviceList)
+
 	projectList, _ := service.GetProjectListNoExecution(timenow, orgId, patientIds)
-	fmt.Println("projectList", projectList)
+
 	//药品管理信息
 	_, drugStockConfig := service.FindHisConfig(orgId)
 
+	_, projectConfig := service.FindXTHisProjectByOrgId(orgId)
+
 	patientList, _ := service.GetPatientNoExecutionList(orgId, patientIds)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -9850,6 +9852,7 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 		"projectList":     projectList,
 		"drugStockConfig": drugStockConfig,
 		"patientList":     patientList,
+		"projectConfig":   projectConfig,
 	})
 
 }

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -55,6 +55,7 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/advice/check", &PatientApiController{}, "Post:CheckDoctorAdvice")
 	beego.Router("/m/api/patient/info", &PatientApiController{}, "Get:GetPatientInfoWithDiseases")
+	beego.Router("/m/api/mobile/advice/check", &PatientApiController{}, "Post:CheckMobileDoctorAdvice")
 
 	beego.Router("/m/api/monitor/add", &DialysisAPIController{}, "post:AddMonitorRecord")
 	beego.Router("/m/api/monitor/edit", &DialysisAPIController{}, "post:EditMonitorRecord")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1960,6 +1960,253 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 }
 
+func (c *PatientApiController) CheckMobileDoctorAdvice() {
+	origin, _ := c.GetInt64("origin", 0)
+	record_date, _ := c.GetInt64("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	check_time := c.GetString("check_time")
+	if len(check_time) <= 0 {
+		utils.ErrorLog("check_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, errs := time.ParseInLocation(timeLayout2, check_time, loc)
+	fmt.Println("theTimewowowow", theTime)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if origin != 2 {
+		groupno, _ := c.GetInt64("groupno", -1)
+		var ids []string
+		if groupno == 0 {
+			advice_ids := c.GetString("advice_id")
+			if advice_ids == "" {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			} else {
+				ids = strings.Split(advice_ids, ",")
+				if len(ids) <= 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+			}
+		}
+		if groupno < 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		adminUserInfo := c.GetMobileAdminUserInfo()
+
+		var advice models.DoctorAdvice
+
+		if groupno > 0 {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range advices {
+				if item.CheckState == 0 {
+					advice = item
+				}
+
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  item.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
+			}
+			if advice.CheckState == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
+				return
+			}
+			if advice.ExecutionStaff >= 0 && advice.ExecutionStaff == adminUserInfo.AdminUser.Id {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+				return
+			}
+
+		} else {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				if item.CheckState == 0 {
+					advice = item
+
+				}
+
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  item.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
+			}
+			if advice.CheckState == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
+				return
+			}
+			if advice.ExecutionStaff >= 0 && advice.ExecutionStaff == adminUserInfo.AdminUser.Id {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
+				return
+			}
+		}
+
+		checker := adminUserInfo.AdminUser.Id
+
+		advices := models.DoctorAdvice{
+			CheckTime:   theTime.Unix(),
+			Checker:     checker,
+			UpdatedTime: time.Now().Unix(),
+		}
+		fmt.Println("groupnowowowowoowowow", groupno)
+		var err error
+		if groupno > 0 {
+
+			// 查询信息规挡的设置天数
+
+			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+			if infor.ID > 0 && infor.WeekDay > 0 {
+
+				var cha_time int64
+
+				timeNowStr := time.Now().Format("2006-01-02")
+				timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+				//今日的日期减去设置的日期
+				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+				if cha_time >= record_date {
+					//查询审核是否允许
+					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminUserInfo.Org.Id, 4)
+					//申请状态不允许的情况 拒绝修改
+					if infor.ApplicationStatus != 1 {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+						return
+					}
+
+				}
+			}
+			err = service.CheckDoctorAdviceByGroupNoOne(&advices, groupno, adminUserInfo.Org.Id)
+
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			//清空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)
+			recordDate := theTime.Format("2006-01-02")
+			keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			defer redis.Close()
+		} else {
+
+			if len(ids[0]) <= 0 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
+				return
+			} else {
+				//t := time.Now().Format("2006-01-02")/**/
+				//timeLayout2 := "2006-01-02"
+				//loc, _ := time.LoadLocation("Local")
+				//theTime, _ := time.ParseInLocation(timeLayout2, t, loc)
+				// 查询信息规挡的设置天数
+
+				infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+				if infor.ID > 0 {
+
+					var cha_time int64
+
+					timeNowStr := time.Now().Format("2006-01-02")
+					timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+					//今日的日期减去设置的日期
+					cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+					if cha_time >= advices.AdviceDate {
+						//查询审核是否允许
+						infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
+						//申请状态不允许的情况 拒绝修改
+						if infor.ApplicationStatus != 1 {
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+							return
+						}
+
+					}
+				}
+				err = service.BatchCheckOldDoctorAdvice(&advices, ids, adminUserInfo.Org.Id, advice.AdviceDate)
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   advices.PatientId,
+					AdminUserId: advices.Checker,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  advices.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				//清空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)
+				recordDate := theTime.Format("2006-01-02")
+				keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+				redis.Set(keyFour, "", time.Second)
+				keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_advices_list_all"
+				redis.Set(keyFive, "", time.Second)
+				defer redis.Close()
+			}
+		}
+
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
+			return
+		}
+
+		advice.Checker = checker
+		advice.CheckTime = theTime.Unix()
+		advice.CheckState = 1
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":    "ok",
+			"advice": advice,
+		})
+	}
+	return
+}
+
 func (c *PatientApiController) CheckDoctorAdvice() {
 	origin, _ := c.GetInt64("origin", 0)
 	record_date, _ := c.GetInt64("record_date")
@@ -2379,7 +2626,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 	lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
-	fmt.Println("22332232o2o", lastDialysisPrescribe.Chaptalization)
+
 	if schedual != nil {
 		// 获取透析模版
 		dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.Org.Id, id, schedual.ModeId)
@@ -3779,6 +4026,16 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.BeforSymptoms = befor_symptoms
 
 	}
+
+	if dataBody["washing_time"] != nil && reflect.TypeOf(dataBody["washing_time"]).String() == "string" {
+		washing_time, _ := dataBody["washing_time"].(string)
+		evaluation.WashingTime = washing_time
+	}
+
+	if dataBody["warsh_count"] != nil && reflect.TypeOf(dataBody["warsh_count"]).String() == "string" {
+		warsh_count, _ := dataBody["warsh_count"].(string)
+		evaluation.WarshCount = warsh_count
+	}
 	return
 }
 

controllers/pharmacy_controller.go

@@ -104,6 +104,7 @@ func (this *PharmacyController) TodayNumber() {
 		var itotal int
 		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
 
+		drug, _ := service.GetAllBaseDrugList(orgid)
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -112,6 +113,7 @@ func (this *PharmacyController) TodayNumber() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"wtotal": wtotal,
 			"itotal": itotal,
+			"drug":   drug,
 		})
 		return
 	}
@@ -123,9 +125,11 @@ func (this *PharmacyController) TodayNumber() {
 		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
 
 		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
+		drug, _ := service.GetAllBaseDrugList(orgid)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"wtotal": wtotal,
 			"itotal": itotal,
+			"drug":   drug,
 		})
 		return
 	}

controllers/secondary_order_api_contorller.go

@@ -609,6 +609,8 @@ func (this *SecondaryOrderApiController) SaveSencondOrder() {
 
 				min_price := items["min_price"].(float64)
 
+				medical_insurance_number := items["medical_insurance_number"].(string)
+
 				info := &models.XtSecondWarehouseInfo{
 					ProjectName:             project_name,
 					SecondSpecificationName: second_specification_name,
@@ -630,6 +632,7 @@ func (this *SecondaryOrderApiController) SaveSencondOrder() {
 					MinPrice:                min_price,
 					IsSource:                is_source,
 					WarehouseId:             secondWarehouse.ID,
+					MedicalInsuranceNumber:  medical_insurance_number,
 				}
 
 				warehousingInfo = append(warehousingInfo, info)

models/device_models.go

@@ -1378,6 +1378,7 @@ type XtNewAriDisinfect struct {
 	Ctime                      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status                     int64  `gorm:"column:status" json:"status" form:"status"`
+	Storey                     string `gorm:"column:storey" json:"storey" form:"storey"`
 }
 
 func (XtNewAriDisinfect) TableName() string {
@@ -1467,6 +1468,7 @@ type XtNewObjectDisinfect struct {
 	LastDisinfectionWater      string `gorm:"column:last_disinfection_water" json:"last_disinfection_water" form:"last_disinfection_water"`
 	LastDisinfectionMethods    string `gorm:"column:last_disinfection_methods" json:"last_disinfection_methods" form:"last_disinfection_methods"`
 	LastDisinfectionTime       string `gorm:"column:last_disinfection_time" json:"last_disinfection_time" form:"last_disinfection_time"`
+	Storey                     string `gorm:"column:storey" json:"storey" form:"storey"`
 }
 
 func (XtNewObjectDisinfect) TableName() string {

models/dialysis.go

@@ -327,6 +327,8 @@ type PredialysisEvaluation struct {
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
 	BeforSymptoms                  string  `gorm:"column:befor_symptoms" json:"befor_symptoms" form:"befor_symptoms"`
+	WashingTime                    string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	WarshCount                     string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 }
 
 func (PredialysisEvaluation) TableName() string {

models/his_models.go

@@ -44,6 +44,7 @@ type XtHisProject struct {
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (XtHisProject) TableName() string {

models/pharmacy_models.go

@@ -55,6 +55,7 @@ type PharmacyContent struct {
 	Doctor       string //开立医生
 	DataSources  string //数据来源
 	Remarks      string //备注
+	DrugId       int64
 }
 
 // 发药明细列表
@@ -254,6 +255,7 @@ type XtDoctorAdviceL struct {
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	People                int64   `gorm:"column:people" json:"people" form:"people"`
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (XtDoctorAdviceL) TableName() string {

models/secondary_models.go

@@ -179,6 +179,7 @@ type XtSecondWarehouseInfo struct {
 	MinPrice                float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
 	WarehouseId             int64   `gorm:"column:warehouse_id" json:"warehouse_id" form:"warehouse_id"`
+	MedicalInsuranceNumber  string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (XtSecondWarehouseInfo) TableName() string {

models/supply.models.go

@@ -19,25 +19,26 @@ func (SpSupplierContacts) TableName() string {
 }
 
 type SpBaseDrug struct {
-	ID                int64                  `gorm:"column:id" json:"id" form:"id"`
-	DrugName          string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugCategory      int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec          string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType          int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	MaxUnit           string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber         int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit           string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose              string                 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit          string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	DrugDose          float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit      int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	Manufacturer      int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	OrgId             int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Number            string                 `gorm:"column:number" json:"number" form:"number"`
-	LastPrice         float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
-	DrugStatus        string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	MinPrice          float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugCategory           int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec               string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	MaxUnit                string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDose               float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit           int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	Manufacturer           int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId                  int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number                 string                 `gorm:"column:number" json:"number" form:"number"`
+	LastPrice              float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugWarehouseInfo      []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	DrugStatus             string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	MinPrice               float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (SpBaseDrug) TableName() string {
@@ -45,19 +46,20 @@ func (SpBaseDrug) TableName() string {
 }
 
 type SpGoodInformation struct {
-	ID                int64              `gorm:"column:id" json:"id" form:"id"`
-	SpecificationName string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId        int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit          int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	Manufacturer      int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	OrgId             int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	GoodName          string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	PackingUnit       string             `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	BuyPrice          float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	GoodStatus        string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
-	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
-	Number            string             `gorm:"column:number" json:"number" form:"number"`
-	RetailPrice       float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	ID                     int64              `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName      string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Manufacturer           int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId                  int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName               string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	PackingUnit            string             `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	BuyPrice               float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	GoodStatus             string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	GoodWarehouseInfo      []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
+	Number                 string             `gorm:"column:number" json:"number" form:"number"`
+	RetailPrice            float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string             `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (SpGoodInformation) TableName() string {

service/dialysis_service.go

@@ -984,6 +984,18 @@ func CheckDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id in
 	return err
 }
 
+func CheckDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, groupNo int64, org_id int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ?  AND status = 1", groupNo, org_id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return err
+}
+
 func CheckOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 	ut := writeDb.Begin()

service/his_hospital_service.go

@@ -17,6 +17,7 @@ type HospitalPatient struct {
 	HisHospitalCheckRecord models.HisHospitalCheckRecord `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	VMHisPrescriptionInfo  VMHisPrescriptionInfo         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
 	HisHospitalOrder       models.HisHospitalOrder       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
+	FirstLetter            string                        `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (HospitalPatient) TableName() string {

service/manage_service.go

@@ -1648,7 +1648,7 @@ func CreateNewAirDisinfect(disinfect models.XtNewAriDisinfect) error {
 	return err
 }
 
-func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewAriDisinfect, total int64, err error) {
+func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64, storey string) (list []*models.XtNewAriDisinfect, total int64, err error) {
 
 	offset := (page - 1) * limit
 
@@ -1662,6 +1662,9 @@ func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
+	if len(storey) > 0 {
+		db = db.Where("storey =?", storey)
+	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	return list, total, err
 }
@@ -1727,7 +1730,7 @@ func CreateNewAirWayDisinfect(disinfect models.XtNewAriDisinfectWay) error {
 	return err
 }
 
-func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewObjectDisinfect, total int64, err error) {
+func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64, storey string) (list []*models.XtNewObjectDisinfect, total int64, err error) {
 
 	offset := (page - 1) * limit
 
@@ -1741,6 +1744,9 @@ func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
+	if len(storey) > 0 {
+		db = db.Where("storey =?", storey)
+	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	return list, total, err
 }
@@ -1785,9 +1791,9 @@ func DeleteObjectTableDisinfect(id int64) error {
 	return err
 }
 
-func GetAirDisInfectionLongTime(user_org_id int64) (list []*models.XtNewAriDisinfect, err error) {
+func GetAirDisInfectionLongTime(user_org_id int64, storey string) (list []*models.XtNewAriDisinfect, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Order("id desc").First(&list).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1 and storey = ?", user_org_id, storey).Order("id desc").First(&list).Error
 	return
 }
 

service/patient_service.go

@@ -3209,9 +3209,9 @@ func CreateDeviceValusalMapVrr(vrr models.XtDeviceValusalMapVrr) error {
 	return err
 }
 
-func GetDialysisOrderNoExecution(start_nurse int64, user_org_id int64) (order []*models.XtDialysisOrder, err error) {
+func GetDialysisOrderNoExecution(start_nurse int64, user_org_id int64, timenow int64) (order []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("start_nurse = ? and user_org_id =? and status =1", start_nurse, user_org_id).Find(&order).Error
+	err = XTReadDB().Where("start_nurse = ? and user_org_id =? and status =1 and dialysis_date =?", start_nurse, user_org_id, timenow).Find(&order).Error
 	return order, err
 }
 

service/pharmacy_service.go

@@ -274,6 +274,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
 			DataSources:  "his处方",
 			Remarks:      v.Remark, //备注
+			DrugId:       v.DrugId,
 		})
 	}
 
@@ -303,6 +304,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
 			DataSources:  "临时医嘱",
 			Remarks:      v.Remark,
+			DrugId:       v.DrugId,
 		})
 	}
 	return