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

controllers/his_api_controller.go

 
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(admin.CurrentOrgId)
+
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"last_prescriptions":  last_prescriptions,
 		"schedule":            sch,
 		"count":               count,
+		"drugStockConfig":     drugStockConfig,
 	})
 	return
 
 		if len(lists) == 1 {
 			his_patient_id = lists[0].ID
 		}
+
 	}
 
-	//校验库存总量
-	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-		if len(prescriptions) > 0 {
-			for _, item := range prescriptions {
-				items := item.(map[string]interface{})
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							var drug_id int64
-							var prescribing_number float64
-							var prescribingNumberUnit string
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
-							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
-								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
-							}
-							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
-								//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
-								prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-								prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+	if drugStockConfig.IsOpen == 1 {
+		//校验库存总量
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
 
-							}
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+									//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
 
-							if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
-								prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
-							}
+								}
 
-							drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
-							if drug.ID == 0 {
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-								return
-							}
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
 
-							if prescribingNumberUnit == drug.MinUnit {
-								if prescribing_number > drug.Total {
-									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+								drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
-							} else {
-								if prescribingNumberUnit == drug.MaxUnit {
-									num := prescribing_number * float64(drug.MinNumber)
-									if num > drug.Total {
+
+								if prescribingNumberUnit == drug.MinUnit {
+									if prescribing_number > drug.Total {
 										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
+								} else {
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if num > drug.Total {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											return
+										}
+									}
 								}
 							}
 						}
 
 				if tempPrescription.ID == 0 {
 					prescription := &models.HisPrescription{
-						ID:                 id,
+						ID:                 0,
 						PatientId:          patient_id,
 						UserOrgId:          adminInfo.CurrentOrgId,
 						RecordDate:         recordDateTime,
 					service.SaveHisPrescription(tempPrescription)
 
 				} else {
+					tempPrescription.ID = id
 					tempPrescription.Type = types
 					tempPrescription.Modifier = adminInfo.AdminUser.Id
 					tempPrescription.Mtime = time.Now().Unix()
 					tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
 					service.SaveHisPrescription(tempPrescription)
-
 				}
-
 				//service.SaveHisPrescription(prescription)
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.CurrentOrgId)
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
 			}
 		}
 
-		if len(advices) > 0 {
-			for _, item := range advices {
-				drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
-				if item.PrescribingNumberUnit == drug.MinUnit {
-					drug.Total = drug.Total + item.PrescribingNumber
-					service.UpdateBaseDrugLib(&drug)
-				} else {
-					if item.PrescribingNumberUnit == drug.MaxUnit {
-						item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
+		if drugStockConfig.IsOpen == 1 {
+			if len(advices) > 0 {
+				for _, item := range advices {
+					drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
+					if item.PrescribingNumberUnit == drug.MinUnit {
 						drug.Total = drug.Total + item.PrescribingNumber
 						service.UpdateBaseDrugLib(&drug)
+					} else {
+						if item.PrescribingNumberUnit == drug.MaxUnit {
+							item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
+							drug.Total = drug.Total + item.PrescribingNumber
+							service.UpdateBaseDrugLib(&drug)
+						}
 					}
 				}
 			}
 func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 	err := service.DelelteDoctorAdvice(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
-		drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
-
-		if advice.PrescribingNumberUnit == drug.MinUnit {
-			drug.Total = drug.Total + advice.PrescribingNumber
-			service.UpdateBaseDrugLib(&drug)
-
-		} else {
-
-			if advice.PrescribingNumberUnit == drug.MaxUnit {
-				advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
+		if drugStockConfig.IsOpen == 1 {
+			drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
+			if advice.PrescribingNumberUnit == drug.MinUnit {
 				drug.Total = drug.Total + advice.PrescribingNumber
 				service.UpdateBaseDrugLib(&drug)
+			} else {
+				if advice.PrescribingNumberUnit == drug.MaxUnit {
+					advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
+					drug.Total = drug.Total + advice.PrescribingNumber
+					service.UpdateBaseDrugLib(&drug)
+				}
 			}
 		}
 
 		}
 	}
 
-	drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
-	if advice.ID == 0 { //医嘱不存在
-		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据单位与基础库一致为最小单位，直接计算
-			drug.Total = drug.Total - advice.PrescribingNumber
-			service.UpdateBaseDrugLib(&drug)
-
-		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据单位为最大单位，需要将最大单位转为最小单位
-			num := advice.PrescribingNumber * float64(drug.MinNumber)
-			drug.Total = drug.Total - num
-			service.UpdateBaseDrugLib(&drug)
-		}
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(advice.UserOrgId)
 
-	} else if advice.ID > 0 { //医嘱存在
-		hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
-		var num float64
+	if drugStockConfig.IsOpen == 1 {
 
-		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据为最小单位
-			if hisAdvice.PrescribingNumberUnit == advice.PrescribingNumberUnit { //原数据为最小单位，三个单位一致为最小单位直接计算
-				if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
-					num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
-					num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
-			} else { //原数据为最大单位，需要将最大单位数量转为最小单位数量
-				num2 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
-				if num2 > advice.PrescribingNumber {
-					num = num2 - advice.PrescribingNumber
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num2 < advice.PrescribingNumber {
-					num = advice.PrescribingNumber - num2
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
+		drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+		if advice.ID == 0 { //医嘱不存在
+			if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据单位与基础库一致为最小单位，直接计算
+				drug.Total = drug.Total - advice.PrescribingNumber
+				service.UpdateBaseDrugLib(&drug)
 
+			} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据单位为最大单位，需要将最大单位转为最小单位
+				num := advice.PrescribingNumber * float64(drug.MinNumber)
+				drug.Total = drug.Total - num
+				service.UpdateBaseDrugLib(&drug)
 			}
 
-		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据为最大单位
-			if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最大单位， 当前数据单位和原数据单位都为最大单位，需要将两个数据转成最小单位
-				num1 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
-				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
-				if num1 > num2 {
-					num = num1 - num2
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num1 < num2 {
-					num = num2 - num1
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
+		} else if advice.ID > 0 { //医嘱存在
+			hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
+			var num float64
+
+			if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据为最小单位
+				if hisAdvice.PrescribingNumberUnit == advice.PrescribingNumberUnit { //原数据为最小单位，三个单位一致为最小单位直接计算
+					if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
+						num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
+						num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
+				} else { //原数据为最大单位，需要将最大单位数量转为最小单位数量
+					num2 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+					if num2 > advice.PrescribingNumber {
+						num = num2 - advice.PrescribingNumber
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num2 < advice.PrescribingNumber {
+						num = advice.PrescribingNumber - num2
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
 
-			} else { //原数据为最小单位，当前数据为最大单位，需要将当前数据数量转为最小单位数量
-				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
-				//num2 := hisAdvice.PrescribingNumber * (drug.Dose / float64(drug.MinNumber))
-				if hisAdvice.PrescribingNumber > num2 {
-					num = hisAdvice.PrescribingNumber - num2
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num2 < advice.PrescribingNumber {
-					num = num2 - hisAdvice.PrescribingNumber
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
 				}
 
+			} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据为最大单位
+				if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最大单位， 当前数据单位和原数据单位都为最大单位，需要将两个数据转成最小单位
+					num1 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+					num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+					if num1 > num2 {
+						num = num1 - num2
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num1 < num2 {
+						num = num2 - num1
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
+
+				} else { //原数据为最小单位，当前数据为最大单位，需要将当前数据数量转为最小单位数量
+					num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+					//num2 := hisAdvice.PrescribingNumber * (drug.Dose / float64(drug.MinNumber))
+					if hisAdvice.PrescribingNumber > num2 {
+						num = hisAdvice.PrescribingNumber - num2
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num2 < advice.PrescribingNumber {
+						num = num2 - hisAdvice.PrescribingNumber
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
+
+				}
 			}
 		}
 	}

controllers/his_project_api_controller.go

 	//orgId := adminUserInfo.CurrentOrgId
 	projectTeamDetail, err := service.GetProjectTeamDetail(id)
 
-	ids := strings.Split(projectTeamDetail.ProjectId, ",")
+	ids := strings.Split(projectTeamDetail.ItemId, ",")
 	hisList, err := service.GetProjectHisListByIds(ids)
 
 	//list, err := service.GetAllProjectList(orgId)

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
 				}
 			}
 		}
-		if len(advices) > 0 {
-			for _, item := range advices {
-				drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, item.DrugId)
-				if item.PrescribingNumberUnit == drug.MinUnit {
-					drug.Total = drug.Total + item.PrescribingNumber
-					service.UpdateBaseDrugLib(&drug)
-				} else {
-					if item.PrescribingNumberUnit == drug.MaxUnit {
-						item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
+		if drugStockConfig.IsOpen == 1 {
+			if len(advices) > 0 {
+				for _, item := range advices {
+					drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, item.DrugId)
+					if item.PrescribingNumberUnit == drug.MinUnit {
 						drug.Total = drug.Total + item.PrescribingNumber
 						service.UpdateBaseDrugLib(&drug)
+					} else {
+						if item.PrescribingNumberUnit == drug.MaxUnit {
+							item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
+							drug.Total = drug.Total + item.PrescribingNumber
+							service.UpdateBaseDrugLib(&drug)
+						}
 					}
 				}
 			}
 		}
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 	err := service.DelelteDoctorAdvice(id, c.GetMobileAdminUserInfo().Org.Id)
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
+
 	if err == nil {
-		drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, advice.DrugId)
-		if advice.PrescribingNumberUnit == drug.MinUnit {
-			drug.Total = drug.Total + advice.PrescribingNumber
-			service.UpdateBaseDrugLib(&drug)
-		} else {
-			if advice.PrescribingNumberUnit == drug.MaxUnit {
-				advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
+		if drugStockConfig.IsOpen == 1 {
+			drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().Org.Id, advice.DrugId)
+			if advice.PrescribingNumberUnit == drug.MinUnit {
 				drug.Total = drug.Total + advice.PrescribingNumber
 				service.UpdateBaseDrugLib(&drug)
+			} else {
+				if advice.PrescribingNumberUnit == drug.MaxUnit {
+					advice.PrescribingNumber = advice.PrescribingNumber * float64(drug.MinNumber)
+					drug.Total = drug.Total + advice.PrescribingNumber
+					service.UpdateBaseDrugLib(&drug)
+				}
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
 
 	//校验库存总量
 
-	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-		if len(prescriptions) > 0 {
-			for _, item := range prescriptions {
-				items := item.(map[string]interface{})
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							var drug_id int64
-							var prescribing_number float64
-							var prescribingNumberUnit string
-
-							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
-								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
-							}
-							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "float64" {
-								//presc ribing_number = advice.(map[string]interface{})["prescribing_number"].(float64)
-								prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-								prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
-
-							}
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
+
+	if drugStockConfig.IsOpen == 1 {
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
+
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "float64" {
+									//presc ribing_number = advice.(map[string]interface{})["prescribing_number"].(float64)
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
 
-							if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
-								prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
-							}
+								}
 
-							drug, _ := service.FindBaseDrugLibRecord(adminInfo.Org.Id, drug_id)
-							if drug.ID == 0 {
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-								return
-							}
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
 
-							if prescribingNumberUnit == drug.MinUnit {
-								if prescribing_number > drug.Total {
-									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+								drug, _ := service.FindBaseDrugLibRecord(adminInfo.Org.Id, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
-							} else {
-								if prescribingNumberUnit == drug.MaxUnit {
-									num := prescribing_number * float64(drug.MinNumber)
-									if num > drug.Total {
+
+								if prescribingNumberUnit == drug.MinUnit {
+									if prescribing_number > drug.Total {
 										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
+								} else {
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if num > drug.Total {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											return
+										}
+									}
 								}
 							}
 						}
 		advice.PrescribingNumberUnit = prescribingNumberUnit
 	}
 
-	drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
-	if advice.ID == 0 { //医嘱不存在
-		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据单位与基础库一致为最小单位，直接计算
-			drug.Total = drug.Total - advice.PrescribingNumber
-			service.UpdateBaseDrugLib(&drug)
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
 
-		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据单位为最大单位，需要将最大单位转为最小单位
-			num := advice.PrescribingNumber * float64(drug.MinNumber)
-			drug.Total = drug.Total - num
-			service.UpdateBaseDrugLib(&drug)
-		}
+	if drugStockConfig.IsOpen == 1 {
+		drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+		if advice.ID == 0 { //医嘱不存在
+			if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据单位与基础库一致为最小单位，直接计算
+				drug.Total = drug.Total - advice.PrescribingNumber
+				service.UpdateBaseDrugLib(&drug)
 
-	} else if advice.ID > 0 { //医嘱存在
-		hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
-		var num float64
+			} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据单位为最大单位，需要将最大单位转为最小单位
+				num := advice.PrescribingNumber * float64(drug.MinNumber)
+				drug.Total = drug.Total - num
+				service.UpdateBaseDrugLib(&drug)
+			}
 
-		if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据为最小单位
-			if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最小单位，三个单位一致为最小单位直接计算
-				if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
-					num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
-					num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
-			} else { //原数据为最大单位，需要将最大单位数量转为最小单位数量
-				num2 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
-				if num2 > advice.PrescribingNumber {
-					num = num2 - advice.PrescribingNumber
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num2 < advice.PrescribingNumber {
-					num = advice.PrescribingNumber - num2
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
+		} else if advice.ID > 0 { //医嘱存在
+			hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
+			var num float64
 
-			}
+			if advice.PrescribingNumberUnit == drug.MinUnit { //当前数据为最小单位
+				if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最小单位，三个单位一致为最小单位直接计算
+					if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
+						num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
+						num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
+				} else { //原数据为最大单位，需要将最大单位数量转为最小单位数量
+					num2 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+					if num2 > advice.PrescribingNumber {
+						num = num2 - advice.PrescribingNumber
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num2 < advice.PrescribingNumber {
+						num = advice.PrescribingNumber - num2
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
 
-		} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据为最大单位
-			if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最大单位， 当前数据单位和原数据单位都为最大单位，需要将两个数据转成最小单位
-				num1 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
-				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
-				if num1 > num2 {
-					num = num1 - num2
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num1 < num2 {
-					num = num2 - num1
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
 				}
 
-			} else { //原数据为最小单位，当前数据为最大单位，需要将当前数据数量转为最小单位数量
-				num2 := advice.PrescribingNumber * float64(drug.MinNumber)
-				//num2 := hisAdvice.PrescribingNumber * (drug.Dose / float64(drug.MinNumber))
-				if hisAdvice.PrescribingNumber > num2 {
-					num = hisAdvice.PrescribingNumber - num2
-					drug.Total = drug.Total + num
-					service.UpdateBaseDrugLib(&drug)
-				} else if num2 < advice.PrescribingNumber {
-					num = num2 - hisAdvice.PrescribingNumber
-					drug.Total = drug.Total - num
-					service.UpdateBaseDrugLib(&drug)
-				}
+			} else if advice.PrescribingNumberUnit == drug.MaxUnit { //当前数据为最大单位
+				if advice.PrescribingNumberUnit == hisAdvice.PrescribingNumberUnit { //原数据为最大单位， 当前数据单位和原数据单位都为最大单位，需要将两个数据转成最小单位
+					num1 := hisAdvice.PrescribingNumber * float64(drug.MinNumber)
+					num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+					if num1 > num2 {
+						num = num1 - num2
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num1 < num2 {
+						num = num2 - num1
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
 
+				} else { //原数据为最小单位，当前数据为最大单位，需要将当前数据数量转为最小单位数量
+					num2 := advice.PrescribingNumber * float64(drug.MinNumber)
+					//num2 := hisAdvice.PrescribingNumber * (drug.Dose / float64(drug.MinNumber))
+					if hisAdvice.PrescribingNumber > num2 {
+						num = hisAdvice.PrescribingNumber - num2
+						drug.Total = drug.Total + num
+						service.UpdateBaseDrugLib(&drug)
+					} else if num2 < advice.PrescribingNumber {
+						num = num2 - hisAdvice.PrescribingNumber
+						drug.Total = drug.Total - num
+						service.UpdateBaseDrugLib(&drug)
+					}
+
+				}
 			}
 		}
 	}

service/his_project_service.go

 }
 
 func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescritpion []*models.HisPrescription, err error) {
-
-	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? and record_date =? AND p_type = ?", patient_id, startime, p_type).Find(&prescritpion).Error
+	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? AND record_date =? AND p_type = ? AND status = 1", patient_id, startime, p_type).Find(&prescritpion).Error
 	return prescritpion, err
 }
 

service/patient_service.go

 //GetAllPatientList 返回全部患者的列表
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
 
-	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
+	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto = 1", orgID)
 
 	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Count(&total).Find(&patients).Error
 	return