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

controllers/mobile_api_controllers/patient_api_controller.go

@@ -552,9 +552,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	//}
 
 	var advice models.DoctorAdvice
+	var tempAdvices []models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		advices, _ := service.FindAllDoctorAdviceByGoroupNoTwo(adminUserInfo.Org.Id, groupno)
+		tempAdvices = advices
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -562,7 +564,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 	} else {
-		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+		advices, _ := service.FindDoctorAdviceByIdsTwo(adminUserInfo.Org.Id, ids)
+		tempAdvices = advices
+
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -622,10 +626,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if drugStockConfig.IsOpen == 1 {
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range advices {
+			for _, item := range tempAdvices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -662,7 +666,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range advices {
+						for _, item := range tempAdvices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -707,7 +711,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range advices {
+					for _, item := range tempAdvices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -781,10 +785,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		} else {
-			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range advices {
+			for _, item := range tempAdvices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -821,7 +825,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range advices {
+						for _, item := range tempAdvices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -866,7 +870,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range advices {
+					for _, item := range tempAdvices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -950,8 +954,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-			for _, item := range advices {
+			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range tempAdvices {
 
 				if item.ExecutionState == 1 && item.Way == 2 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -987,8 +991,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		} else {
 
-			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-			for _, item := range advices {
+			for _, item := range tempAdvices {
 				if item.ExecutionState == 1 && item.Way == 2 {
 
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)

service/patient_service.go

@@ -1366,6 +1366,6 @@ func FindAllDoctorAdviceByGoroupNoTwo(orgID int64, groupno int64) (advice []mode
 }
 
 func FindDoctorAdviceByIdsTwo(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 OR (id IN (?) AND patient_id IN (?))", orgID, ids, ids).Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 AND (id IN (?) OR parent_id IN (?))", orgID, ids, ids).Find(&advice).Error
 	return
 }