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

controllers/patient_api_controller.go

@@ -1105,7 +1105,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		return
 	}
 	adviceType := int64(dataBody["advice_type"].(float64))
-	if adviceType != 1 && adviceType != 2 && adviceType != 3 {
+	if adviceType != 1 && adviceType != 2 && adviceType != 3 && adviceType != 4 {
 		utils.ErrorLog("advice_type != 1&&2")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2885,7 +2885,7 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 			return
 		}
 		adviceType := int64(dataBody["advice_type"].(float64))
-		if adviceType != 1 && adviceType != 2 && adviceType != 3 {
+		if adviceType != 1 && adviceType != 2 && adviceType != 3 && adviceType != 4 {
 			utils.ErrorLog("advice_type != 1&&2")
 			code = enums.ErrorCodeParamWrong
 			return

models/service/device_service.go

@@ -557,7 +557,7 @@ func GetZoneId(bednumber int64, orgid int64) (models.DeviceNumber, error) {
 //}
 
 // func CreateMacher(machers *models.DeviceAddmacher) error {
-//      fmt.Println("进来了米有")
+
 // 	begin := writeDb.Begin()
 // 	fmt.Println("hhhhhhhh",begin)
 // 	err := begin.Model(&models.DeviceAddmacher{}).Create(machers).Error

service/stock_service.go

@@ -2013,7 +2013,7 @@ func FindUserDetailById(org_id int64, id int64) (user []*models.AutomaticReduceD
 	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
 	db = db.Preload("GoodsType", "status = 1")
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
-	db = db.Where("status = 1 AND org_id = ? AND warehouse_out_id = ? AND good_id != 0", org_id, id)
+	db = db.Where("status = 1 AND org_id = ? AND warehouse_out_id = ? AND good_id != 0 AND count <> 0 ", org_id, id)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 	return