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

controllers/dialysis_record_api_controller.go

@@ -265,7 +265,12 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.CurrentOrgId)
 
-	his_advices, _ := service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.CurrentOrgId)
+
+	var his_advices []*models.HisDoctorAdviceInfo
+	if is_open_config.IsOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	}
 
 	returnData := map[string]interface{}{
 		"patient":                     patient,
@@ -292,6 +297,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"headNurses":                  headNurses,
 		"system_prescribe":            systemDialysisPrescribe,
 		"his_advices":                 his_advices,
+		"is_open_config":              is_open_config,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/his_api_controller.go

@@ -64,6 +64,10 @@ func HisManagerApiRegistRouters() {
 
 	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
 
+	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
+
+	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
+
 }
 
 func (c *HisApiController) GetHisPatientList() {
@@ -2115,3 +2119,51 @@ func (this *HisApiController) GetAdminUsers() {
 		"doctors": doctors,
 	})
 }
+
+func (this *DialysisApiController) GetLastOrNextHisPrescription() {
+	change_type, _ := this.GetInt64("type", 0)
+	record_date := this.GetString("record_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
+	record_time := theAdviceRecordTime.Unix()
+	adminUserInfo := this.GetAdminUserInfo()
+	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id)
+	if err == nil {
+		if len(prescriptions) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
+			return
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"prescriptions": prescriptions,
+			})
+			return
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetCallHisPrescription() {
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	end_time := this.GetString("end_time")
+	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.CurrentOrgId, patient_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescriptions": prescriptions,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/new_mobile_api_controllers/good_types.json

@@ -13,7 +13,7 @@
       "status": 1,
       "type": 1,
       "number": 1,
-      "out_stock": 1,
+      "out_stock": 1
     },
     {
       "id": 10001,

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -1266,6 +1266,7 @@ func InitGoodTypesConfig(org *models.Org) {
 			OrgId:    org.Id,
 			Status:   1,
 			Type:     1,
+			OutStock: item.OutStock,
 		}
 		service.AddSigleGoodType(good_type)
 	}

controllers/verify_login_controller.go

@@ -252,13 +252,16 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 							if len(ids) == 0 {
 								ids = purview_ids
 							} else {
-								ids = ids + "," + purview_ids
+								if len(purview_ids) > 0 {
+									ids = ids + "," + purview_ids
+								}
 							}
 
 							if len(system_ids) > 0 {
 								ids = ids + "," + system_ids
 							}
 						}
+
 						if len(ids) != 0 {
 							pruviews, _ = service.GetPurviewById(CompressStr(ids))
 							for _, item := range pruviews {

models/vm_models.go

@@ -348,6 +348,7 @@ type VMGoodsType struct {
 	Status   int64  `gorm:"column:status" json:"status"`
 	Type     int64  `gorm:"column:type" json:"type"`
 	Number   int64  `gorm:"column:number" json:"number"`
+	OutStock int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
 }
 
 func (VMGoodsType) TableName() string {

service/dialysis_service.go

@@ -320,11 +320,22 @@ func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) err
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
 }
+
+func ExceHidDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	return err
+}
+
 func CheckDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	return err
 }
 
+func CheckHisDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	return err
+}
+
 func CreateMonitor(m *models.MonitoringRecord) (err error) {
 	return writeDb.Create(m).Error
 }
@@ -1122,6 +1133,12 @@ func GetExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice [
 	return doctorAdvice, err
 }
 
+func GetHisExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and patient_id = ? AND (id = ? Or parent_id=?) and status = 1", orgid, patientid, id, id).Find(&doctorAdvice).Error
+	return doctorAdvice, err
+}
+
 func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdviceInfo, err error) {
 	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return

service/his_service.go

@@ -720,3 +720,76 @@ func UpdateHisPatientIsReturn(patientid int64, recorddate int64, orgid int64) (m
 	err := XTWriteDB().Model(&patient).Where("patient_id = ? and record_date = ? and user_org_id = ? and status = 1", patientid, recorddate, orgid).Updates(map[string]interface{}{"is_return": 3}).Error
 	return patient, err
 }
+
+type VMOtherHisPrescriptionInfo struct {
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId         int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate        int64                `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId         int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	CheckGroup        []int64              `gorm:"-" json:"check_group" form:"check_group"`
+	VMHisPrescription []*VMHisPrescription `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"prescriptions"`
+}
+
+func (VMOtherHisPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
+}
+
+type VMHisPrescription struct {
+	ID                     int64                            `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                 int64                            `gorm:"column:status" json:"status" form:"status"`
+	OrderStatus            int64                            `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	BatchNumber            string                           `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                           `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Type                   int64                            `gorm:"column:type" json:"type" form:"type"`
+	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"doctor_advice"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+}
+
+func (VMHisPrescription) TableName() string {
+	return "his_prescription"
+}
+
+func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+	if change_type == 1 { //根据日期取出上一方数据
+		var Id AdviceDate
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+					})
+			}).Find(&advice).Error
+
+	} else if change_type == 2 {
+		var Id AdviceDate
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date > ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date desc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+					})
+			}).Find(&advice).Error
+	}
+	return
+}
+
+func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ?", patient_id, org_id, start_time, end_time).
+		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+				})
+		}).Find(&advice).Error
+
+	return
+}

service/patient_service.go

@@ -710,6 +710,12 @@ func FindDoctorAdvice(orgID, id int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
 	return
 }
+
+func FindHisDoctorAdvice(orgID, id int64) (advice models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).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