历史排班

controllers/manage_api_controller.go

@@ -145,6 +145,8 @@ func ManageRouters() {
 	beego.Router("/api/manage/getobjecttabledisinfectbyidlist", &MachineApiController{}, "Get:GetObjectTableDisinfectByList")
 	beego.Router("/api/manage/updateobjecttabledisinfect", &MachineApiController{}, "Post:UpdateObjectTableDisinfect")
 	beego.Router("/api/manage/deleteobjecttabledisinfect", &MachineApiController{}, "Get:DeleteObjectTableDisinfect")
+	beego.Router("/api/manage/getairdisinfectionlongtime", &MachineApiController{}, "Get:GetAirDisinfectionLongTime")
+	beego.Router("/api/manage/getobjcttabledisinfectlongtime", &MachineApiController{}, "Get:GetObjectDisInfectionLongTime")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -5389,3 +5391,33 @@ func (this *MachineApiController) DeleteObjectTableDisinfect() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *MachineApiController) GetAirDisinfectionLongTime() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetAirDisInfectionLongTime(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) GetObjectDisInfectionLongTime() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetObjectDisInfectionLongTime(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -688,20 +688,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
-				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-
-				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				for _, item := range advices {
-					if item.Way == 1 {
-						isHasWay = true
-					}
+				advices, _ := service.FindAllDoctorAdviceByGoroupNoTwety(adminUserInfo.Org.Id, groupno)
 
-				}
-
-				if isHasWay {
+				if len(advices) > 0 {
 					var total int64
 					var prescribing_number_total int64
 
+					//判断库存
 					for _, item := range advices {
 						if item.Way == 1 {
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -753,39 +746,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 							}
 
-							if prescribing_number_total <= total {
+						}
+					}
 
-								//查询是否出库按钮开启
-								adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
-								if adviceSetting.IsAdviceOpen == 1 {
-									//查询是否出库按钮开启
-									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 {
-											if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-											}
-											if pharmacyConfig.IsOpen != 1 {
-												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-											}
+					//出库
+					for _, item := range advices {
+						if item.Way == 1 {
 
-											//更新字典里面的库存
-											stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-											var sum_count int64
-											for _, its := range stockInfo {
-												if its.MaxUnit == medical.MaxUnit {
-													its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-												}
-												sum_count += its.StockMaxNumber + its.StockMinNumber
-											}
-											service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-											//剩余库存
-											service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-										}
-									}
-								} else {
-									pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+							//查询是否出库按钮开启
+							adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							if adviceSetting.IsAdviceOpen == 1 {
+								//查询是否出库按钮开启
+								prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+								if prescriptionConfig.IsOpen == 1 {
 									if medical.IsUse == 2 {
 										if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
@@ -794,6 +770,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
+										//更新字典里面的库存
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
 										for _, its := range stockInfo {
@@ -807,23 +784,47 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 									}
 								}
+							} else {
+								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+								if medical.IsUse == 2 {
+									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
+									if pharmacyConfig.IsOpen != 1 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									}
+
+									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+									var sum_count int64
+									for _, its := range stockInfo {
+										if its.MaxUnit == medical.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
+									}
+									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+									//剩余库存
+									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+								}
 							}
 						}
+
 					}
 
 				}
-			} else {
 
-				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-				isHasWay := false //用来判断是否包含来自药品库的医嘱
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 
-				for _, item := range advices {
-					if item.Way == 1 {
-						isHasWay = true
-					}
-				}
+			} else {
+
+				advices, _ := service.FindDoctorAdviceByIdsTwety(adminUserInfo.Org.Id, ids)
 
-				if isHasWay {
+				if len(advices) > 0 {
 					var total int64
 					var prescribing_number_total int64
 					for _, item := range advices {
@@ -880,51 +881,56 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 							}
 
-							if prescribing_number_total <= total {
-								pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
-								if medical.IsUse == 2 {
-									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-									}
-									if pharmacyConfig.IsOpen != 1 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-									}
+						}
+					}
 
-									//更新字典里面的库存
-									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-									var sum_count int64
-									for _, its := range stockInfo {
-										baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
-										if its.MaxUnit == baseDrug.MaxUnit {
-											its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
-										}
-										sum_count += its.StockMaxNumber + its.StockMinNumber
-									}
-									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-									//剩余库存
-									service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+					for _, item := range advices {
+						if item.Way == 1 {
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+							if medical.IsUse == 2 {
+								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 								}
-								if medical.IsUse == 1 {
-									c.ServeSuccessJSON(map[string]interface{}{
-										"msg":    "1",
-										"advice": advice,
-										"ids":    ids,
-									})
-									return
+								if pharmacyConfig.IsOpen != 1 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 								}
 
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								for _, its := range stockInfo {
+									baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+									if its.MaxUnit == baseDrug.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 							}
+							if medical.IsUse == 1 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+
 						}
+
 					}
 				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+				return
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "1",
-				"advice": advice,
-				"ids":    ids,
-			})
-			return
 		}
 
 		if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {

controllers/print_data_api_controller.go

@@ -339,7 +339,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	if types == 2 {
 		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
 		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
-		fmt.Println("list23323232233232", list)
+
 		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/dialysis_service.go

@@ -1111,7 +1111,7 @@ func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string, org_id int6
 
 func ModifyScheduleMode(mode_id int64, patient_id int64, recordDate int64, org_id int64, dialysis_machine_name string) {
 	ut := writeDb.Begin()
-	err = writeDb.Model(&models.Schedule{}).Where("status = 1   AND user_org_id = ? AND patient_id = ? AND schedule_date = ?", org_id, patient_id, recordDate).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "mode_id": mode_id, "dialysis_machine_name": dialysis_machine_name}).Error
+	err = writeDb.Model(&models.Schedule{}).Where("status = 1   AND user_org_id = ? AND patient_id = ? AND schedule_date >= ?", org_id, patient_id, recordDate).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "mode_id": mode_id, "dialysis_machine_name": dialysis_machine_name}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/manage_service.go

@@ -1729,3 +1729,15 @@ func DeleteObjectTableDisinfect(id int64) error {
 	err := XTWriteDB().Model(&models.XtNewObjectDisinfect{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetAirDisInfectionLongTime(user_org_id int64) (list []*models.XtNewAriDisinfect, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
+	return
+}
+
+func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjectDisinfect, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
+	return
+}

service/patient_service.go

@@ -1580,11 +1580,21 @@ func FindAllDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice []models.
 	return
 }
 
+func FindAllDoctorAdviceByGoroupNoTwety(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", orgID, groupno).Find(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1", ids, orgID).Find(&advice).Error
 	return
 }
 
+func FindDoctorAdviceByIdsTwety(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", ids, orgID).Find(&advice).Error
+	return
+}
+
 func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix(), "modifier": user_id}).Error