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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id
+		subscibe.OrgId = 10340 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17260 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id小英9675或4
+		subscibe.OrgId = 10340 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17260 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/device_api_controller.go

@@ -1,15 +1,17 @@
 package controllers
 
 import (
+	"time"
+
 	"XT_New/utils"
 	"github.com/jinzhu/gorm"
-	"time"
 
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 
 	"fmt"
+
 	"github.com/astaxie/beego"
 )
 
@@ -520,6 +522,7 @@ func (this *DeviceAPIController) GetZones() {
 func (this *DeviceAPIController) CreateZone() {
 	name := this.GetString("name")
 	type_, _ := this.GetInt("type")
+	sort, _ := this.GetInt64("sort")
 	if len(name) == 0 || type_ <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -527,9 +530,9 @@ func (this *DeviceAPIController) CreateZone() {
 
 	adminInfo := this.GetAdminUserInfo()
 	_, errcode := service.GetZoneByName(name, adminInfo.CurrentOrgId)
-	fmt.Println("errcode=----------", errcode)
+
 	if errcode == gorm.ErrRecordNotFound {
-		zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_)
+		zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_, sort)
 		if createErr != nil {
 			this.ErrorLog("创建设备分区失败:%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
@@ -552,6 +555,7 @@ func (this *DeviceAPIController) ModifyZone() {
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	type_, _ := this.GetInt("type")
+	sort, _ := this.GetInt64("sort")
 	if id <= 0 || len(name) == 0 || type_ <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -570,6 +574,7 @@ func (this *DeviceAPIController) ModifyZone() {
 
 	zone.Name = name
 	zone.Type = type_
+	zone.Sort = sort
 	zone.ModifyTime = time.Now().Unix()
 
 	byName, _ := service.GetZoneByNameOne(name, adminInfo.CurrentOrgId)

controllers/his_api_controller.go

@@ -3183,7 +3183,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10164 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/mobile_api_controllers/login_api_controller.go

@@ -1,10 +1,6 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -12,6 +8,11 @@ import (
 	"net/url"
 	"strconv"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+
 	"github.com/astaxie/beego"
 )
 
@@ -23,6 +24,7 @@ type LoginAPIController struct {
 // @param mobile:string
 // @param password:string
 func (this *LoginAPIController) LoginByPwd() {
+
 	mobile := this.GetString("mobile")
 	pwd := this.GetString("password")
 	//var mobile = "15089497668"

controllers/mobile_api_controllers/patient_api_controller.go

@@ -300,7 +300,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	advice.UpdatedTime = time.Now().Unix()
 	advice.UserOrgId = adminUserInfo.Org.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
-
+	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 	//处理修改医嘱开始时间逻辑(不包括子医嘱)
 	//1.一组医嘱内只有一条医嘱(不包括子医嘱)的情况下，只需要直接修改医嘱开始时间，不需要重新分配组号
 	//2.一组医嘱内有多条医嘱(不包括子医嘱)的情况下,需要为修改的那条医嘱重新分配组号，并修改医嘱开始时间
@@ -393,6 +393,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 				gruopNo := service.GetMaxAdviceGroupID(adminUserInfo.Org.Id)
 				gruopNo = gruopNo + 1
 				advice.GroupNo = gruopNo
+				advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 				err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -1,20 +1,21 @@
 package new_mobile_api_controllers
 
 import (
-	"XT_New/controllers/mobile_api_controllers"
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
 )
 
 type NewLoginApiController struct {
@@ -22,8 +23,8 @@ type NewLoginApiController struct {
 }
 
 func (this *NewLoginApiController) GetLogin() {
-	token_cookie := this.Ctx.GetCookie("token_cookie")
 
+	token_cookie := this.Ctx.GetCookie("token_cookie")
 	if len(token_cookie) == 0 {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"isLogin": false,

controllers/patient_api_controller.go

@@ -7674,7 +7674,7 @@ func (c *PatientApiController) SavePatientLapse() {
 	//病人转出
 	if lapse_type == 2 {
 
-		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate)
+		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate, lapse_reason)
 
 		service.UpdateScheduleByDeathTime(patient_id, recordDate)
 
@@ -7684,7 +7684,7 @@ func (c *PatientApiController) SavePatientLapse() {
 	//病人转出
 	if lapse_type == 3 {
 
-		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate)
+		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate, lapse_reason)
 
 		service.UpdateScheduleByDeathTime(patient_id, recordDate)
 
@@ -7857,7 +7857,7 @@ func (c *DialysisApiController) UpdatePatientLapseRecord() {
 
 	//病人转出
 	if lapse_type == 2 {
-		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate)
+		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate, lapse_reason)
 
 		service.UpdateScheduleByDeathTime(patient_id, recordDate)
 
@@ -7865,7 +7865,7 @@ func (c *DialysisApiController) UpdatePatientLapseRecord() {
 	}
 
 	if lapse_type == 3 {
-		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate)
+		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate, lapse_reason)
 
 		service.UpdateScheduleByDeathTime(patient_id, recordDate)
 

service/device_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 //////// 设备基本信息
@@ -302,7 +303,7 @@ func GetZoneByNameOne(name string, orgid int64) (zone models.DeviceZone, err err
 	return zone, err
 }
 
-func CreateDeviceZone(orgID int64, name string, type_ int) (*models.DeviceZone, error) {
+func CreateDeviceZone(orgID int64, name string, type_ int, sort int64) (*models.DeviceZone, error) {
 	now := time.Now().Unix()
 	zone := models.DeviceZone{
 		OrgID:      orgID,
@@ -311,6 +312,7 @@ func CreateDeviceZone(orgID int64, name string, type_ int) (*models.DeviceZone,
 		Status:     1,
 		CreateTime: now,
 		ModifyTime: now,
+		Sort:       sort,
 	}
 	err := writeDb.Model(&models.DeviceZone{}).Create(&zone).Error
 	if err != nil {

service/patient_service.go

@@ -2143,20 +2143,20 @@ func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
 	return err
 }
 
-func UpdatePatientLapsetoByPatientId(patient_id int64, record_date int64) error {
+func UpdatePatientLapsetoByPatientId(patient_id int64, record_date int64, lapse_reason string) error {
 
-	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2}).Error
+	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2, "out_reason": lapse_reason}).Error
 
-	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2}).Error
+	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 2, "out_reason": lapse_reason}).Error
 
 	return err
 }
 
-func UpdatePatientLapsetoByPatientIdOne(patient_id int64, record_date int64) error {
+func UpdatePatientLapsetoByPatientIdOne(patient_id int64, record_date int64, lapse_reason string) error {
 
-	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3}).Error
+	err := XTWriteDB().Model(&models.Patients{}).Where("id = ? and status= 1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3, "out_reason": lapse_reason}).Error
 
-	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3}).Error
+	err = XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status=1", patient_id).Updates(map[string]interface{}{"death_time": record_date, "lapseto": 3, "out_reason": lapse_reason}).Error
 
 	return err
 }

service/self_drug_service.go

@@ -3127,7 +3127,7 @@ func GetInitOutBanceList(good_id int64, user_org_id int64, start_time int64, end
 		db = db.Where("storehouse_id = ?", storehouse_id)
 	}
 
-	err = db.Group("patient_id,good_id,sys_record_time,is_sys").Find(&list).Error
+	err = db.Group("patient_id,good_id,sys_record_time,is_sys,ctime").Find(&list).Error
 
 	return list, err
 }