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/dialysis_api_controller.go

@@ -4332,14 +4332,14 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 
 				good_id := int64(items["good_id"].(float64))
-				fmt.Println("goood_id2222222222222222", good_id)
+
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
 				good_type_id := int64(items["good_type_id"].(float64))
-				fmt.Println("goood_id2222222222222222", good_type_id)
+
 				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
 					utils.ErrorLog("count")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4347,7 +4347,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-				fmt.Println("count22222222", count)
+
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					UserOrgId:  adminUser.Org.Id,
@@ -4679,18 +4679,22 @@ func (c *DialysisAPIController) BathDeleteAdviceList() {
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
-	idsInt := dataBody["ids"].([]interface{})
-	ids := make([]int64, 0)
-	for _, item := range idsInt {
-		id, _ := strconv.ParseInt(item.(string), 10, 64)
-		ids = append(ids, id)
+	ids := c.GetString("ids")
+	fmt.Println("dis22222222", ids)
+	idArray := strings.Split(ids, ",")
+	origin, _ := c.GetInt64("origin")
+	if origin == 1 {
+		err = service.BatchDeleteAdvice(idArray)
+		fmt.Print("err", err)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "批量删除成功",
+		})
+		return
+	}
+
+	if origin == 2 {
+		service.BatchDeleteHisAdvice(idArray)
 	}
-	err = service.BatchDeleteAdvice(ids)
-	fmt.Print("err", err)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "批量删除成功",
-	})
-	return
 }
 
 func (c *DialysisAPIController) UpdateAutoReduceDetail() {
@@ -4718,3 +4722,61 @@ func (c *DialysisAPIController) DeleteAutoReduceDetail() {
 	})
 	return
 }
+
+func (c *DialysisAPIController) BatchAdviceCheck() {
+
+	ids := c.GetString("ids")
+	fmt.Println("dis22222222", ids)
+	idArray := strings.Split(ids, ",")
+	creator, _ := c.GetInt64("creator")
+	origin, _ := c.GetInt64("origin")
+	if origin == 1 {
+		err := service.BatchAdviceCheck(idArray, creator)
+		fmt.Println(err)
+		list, _ := service.GetAdviceExecutionById(idArray)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+	if origin == 2 {
+		service.BatchHisAdviceCheck(idArray, creator)
+	}
+
+}
+
+func (c *DialysisAPIController) BatchAdviceExecution() {
+
+	ids := c.GetString("ids")
+	fmt.Println("dis22222222", ids)
+	idArray := strings.Split(ids, ",")
+	executionTime := c.GetString("execution_time")
+	fmt.Println("333333333", executionTime)
+	creator, _ := c.GetInt64("creator")
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, _ := time.ParseInLocation(timeLayout, executionTime, loc)
+
+	orgin, _ := c.GetInt64("origin")
+	if orgin == 1 {
+		err := service.BatchAdviceExecution(idArray, creator, theTime.Unix())
+		list, _ := service.GetAdviceExecutionById(idArray)
+		fmt.Println(err)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+
+	if orgin == 2 {
+		err := service.BatchAdviceExecution(idArray, creator, theTime.Unix())
+		list, _ := service.GetHisAdviceExecutionById(idArray)
+		fmt.Println(err)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -140,7 +140,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
 
 	//批量删除监测
-	beego.Router("/m/api/batchDeleteMonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
+	beego.Router("/m/api/batchdeletemonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
 	//获取单个患者1年的透析日期
 	beego.Router("/m/api/getPatientDialysisRecord", &DialysisAPIController{}, "Get:GetPatientDialysisRecordList")
 	//批量删除医嘱
@@ -149,4 +149,11 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/updateautoreducedetail", &DialysisAPIController{}, "Get:UpdateAutoReduceDetail")
 	//删除数据
 	beego.Router("/m/api/deleteautoreducedetail", &DialysisAPIController{}, "Get:DeleteAutoReduceDetail")
+
+	//医嘱批量核对
+	beego.Router("/m/api/batchadvicecheck", &DialysisAPIController{}, "Get:BatchAdviceCheck")
+
+	//医嘱批量执行
+	beego.Router("/m/api/batchadviceexecution", &DialysisAPIController{}, "Get:BatchAdviceExecution")
+
 }

controllers/stock_api_controller.go

@@ -288,10 +288,12 @@ func (c *StockApiController) ModifyManufacturer() {
 		PinYin:           pinyin,
 	}
 
-	Manufacturer, _ := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+	_, errrcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+
+	if errrcode == nil {
 
-	if Manufacturer.ID > 0 && Manufacturer.ID != manufacturer.ID {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIdCardNoExist)
+
 		return
 	}
 

models/his_models.go

@@ -232,6 +232,7 @@ type HisDoctorAdviceInfo struct {
 	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/drug_stock_service.go

@@ -100,6 +100,7 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 	}
 
 	if startTime > 0 {
+
 		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and ctime >=?", orgId, startTime)
 		})
@@ -107,6 +108,7 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and sys_record_time>=?", orgId, startTime)
 		})
+
 		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime>=?", orgId, startTime)
 	} else {
 
@@ -122,11 +124,11 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 
 	if endTime > 0 {
 		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and ctime>=? and ctime <=?", orgId, startTime, endTime)
+			return db.Where("org_id = ? AND status = 1  and ctime <=?", orgId, startTime, endTime)
 		})
 		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1 and ctime>=? and ctime<=?", orgId, startTime, endTime)
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endTime)
+			return db.Where("org_id = ? AND status = 1 and sys_record_time>=? and sys_record_time<=?", orgId, startTime, endTime)
 		})
 		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime >=? and ctime<=?", orgId, startTime, endTime)
 	} else {

service/mobile_dialysis_service.go

@@ -291,6 +291,7 @@ type VMDoctorAdvice struct {
 	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
 	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
 	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	ParentId       int64 `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
 }
 
 func (VMDoctorAdvice) TableName() string {
@@ -1982,7 +1983,7 @@ func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64
 	return order, err
 }
 
-func BatchDeleteAdvice(ids []int64) (err error) {
+func BatchDeleteAdvice(ids []string) (err error) {
 
 	if len(ids) == 1 {
 		err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("id=?", ids[0]).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
@@ -1994,6 +1995,17 @@ func BatchDeleteAdvice(ids []int64) (err error) {
 
 }
 
+func BatchDeleteHisAdvice(ids []string) (err error) {
+
+	if len(ids) == 1 {
+		err = XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", ids[0]).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	} else {
+		err = XTWriteDB().Model(models.HisDoctorAdviceInfo{}).Where("id IN(?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	}
+
+	return
+}
+
 func UpdateAutoReduceDetail(good_id int64, count int64, record_time int64, patient_id int64) (models.AutomaticReduceDetail, error) {
 	detail := models.AutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_time = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
@@ -2005,3 +2017,35 @@ func DeleteAutoReduceDetail(good_id int64, record_time int64, patient_id int64)
 	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_time = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func BatchAdviceCheck(ids []string, creator int64) error {
+
+	advice := models.XtDoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id IN(?) and status = 1", ids).Updates(map[string]interface{}{"check_state": 1, "checker": creator, "check_time": time.Now().Unix()}).Error
+	return err
+}
+
+func BatchHisAdviceCheck(ids []string, creator int64) error {
+	advice := models.HisDoctorAdviceInfo{}
+	err := XTWriteDB().Model(&advice).Where("id IN(?) and status = 1", ids).Updates(map[string]interface{}{"check_state": 1, "checker": creator, "check_time": time.Now().Unix()}).Error
+	return err
+}
+
+func BatchAdviceExecution(ids []string, creator int64, execution_state int64) error {
+
+	advice := models.XtDoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id IN(?) and status = 1", ids).Updates(map[string]interface{}{"execution_state": 1, "execution_staff": creator, "execution_time": execution_state}).Error
+	return err
+}
+
+func GetAdviceExecutionById(ids []string) (doctor []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Model(&doctor).Where("id IN(?) AND status = 1", ids).Find(&doctor).Error
+	return doctor, err
+}
+
+func GetHisAdviceExecutionById(ids []string) (doctor []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Model(&doctor).Where("id IN(?) AND status = 1", ids).Find(&doctor).Error
+	return doctor, err
+}

service/patient_service.go

@@ -1155,12 +1155,12 @@ func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdv
 
 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, "mtime": time.Now().Unix(), "modifier": user_id}).Error
+	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
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "modifier": user_id}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix(), "modifier": user_id}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/stock_service.go

@@ -1204,7 +1204,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 	if endtime > 0 {
 
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endtime)
+			return db.Where("org_id = ? AND status = 1 and sys_record_time >=? and sys_record_time<=?", orgId, startime, endtime)
 		})
 	}