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

controllers/doctors_api_controller.go

@@ -183,11 +183,15 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {
 
 	adminUserInfo := c.GetAdminUserInfo()
+
 	doctors, nursers, _ := service.GetAllDoctorAndNurseSeven(adminUserInfo.CurrentOrgId)
 
+	signature, _ := service.GetAdminUserEsTwo(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"doctors": doctors,
-		"nursers": nursers,
+		"doctors":   doctors,
+		"nursers":   nursers,
+		"signature": signature,
 	})
 	return
 }

controllers/patient_api_controller.go

@@ -4490,6 +4490,10 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 
 	groupNo, _ := c.GetInt64("groupno", 0)
 
+	patient_id, _ := c.GetInt64("patient_id")
+
+	advice_date, _ := c.GetInt64("advice_date")
+
 	if groupNo <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -4497,7 +4501,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	advice, _ := service.FindDoctorAdviceByGroupNo(adminUserInfo.CurrentOrgId, groupNo)
+	advice, _ := service.FindDoctorAdviceByGroupNoOne(adminUserInfo.CurrentOrgId, groupNo, patient_id, advice_date)
 	if advice.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 		return
@@ -4554,7 +4558,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 		}
 	}
 
-	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
+	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id, patient_id, advice_date)
 
 	byterequest, _ := json.Marshal(advice)
 	doctorAdviceLog := models.XtDoctorAdviceLog{

controllers/stock_in_api_controller.go

@@ -1544,6 +1544,7 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 		}
 
 	}
+	fmt.Println("ids======================", ids)
 	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type, check_type)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	patients, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)

service/patient_service.go

@@ -1283,8 +1283,8 @@ func DeleteDoctorAdvice(m *models.DoctorAdvice) (err error) {
 
 	return
 }
-func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err error) {
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ?", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
+func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64, patient_id int64, advice_date int64) (err error) {
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ? and patient_id = ? and advice_date = ? and status=1", orgId, groupNo, patient_id, advice_date).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
 	if err != nil {
 		return
 	}
@@ -1329,6 +1329,11 @@ func FindHisDoctorAdviceOne(orgID, patient_id int64) (advice models.HisDoctorAdv
 	return
 }
 
+func FindDoctorAdviceByGroupNoOne(orgID, groupNo int64, patient_id int64, advice_date int64) (advice models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("groupno = ? and user_org_id=? and status = 1 and patient_id = ? and advice_date = ?", groupNo, orgID, patient_id, advice_date).First(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("groupno = ? and user_org_id=? and status = 1", groupNo, orgID).First(&advice).Error
 	return

service/stock_service.go

@@ -2095,7 +2095,7 @@ func FindAllWarehouseOutList(orgId int64, page int64, limit int64, startTime int
 
 func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64, check_type int64) (list []*models.WarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.WarehouseOut{})
-	db = db.Where("xt_warehouse_out.org_id = ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.type = ?", orgId, types)
+	db = db.Where("xt_warehouse_out.org_id = ? AND xt_warehouse_out.status = 1", orgId)
 
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"