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

controllers/his_api_controller.go

@@ -106,69 +106,79 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/getfapiaonumber", &HisApiController{}, "get:GetFaPiaoNumber")
 
-	//beego.Router("/api/associationprescription", &HisApiController{}, "get:AssociationHisPrescription")
-	//beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
+	beego.Router("/api/associationprescription", &HisApiController{}, "get:AssociationHisPrescription")
+	beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
 
 }
 
-//func (c *HisApiController) CheckHisPatient() {
-//	record_date := c.GetString("record_date")
-//	patient_id, _ := c.GetInt64("patient_id")
-//
-//	timeLayout := "2006-01-02"
-//	loc, _ := time.LoadLocation("Local")
-//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
-//	if err != nil {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//	recordDateTime := theTime.Unix()
-//	adminInfo := c.GetAdminUserInfo()
-//	patients, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient_id, recordDateTime)
-//	if len(patients) > 1 {
-//		ps, _ := service.GetHisPrescriptionByHisPatientID(recordDateTime, adminInfo.CurrentOrgId, patient_id)
-//		if len(ps) > 0 {
-//			c.ServeSuccessJSON(map[string]interface{}{
-//				"status": 1,
-//				"msg":    "关联",
-//				"ps":     ps,
-//			})
-//		} else {
-//			c.ServeSuccessJSON(map[string]interface{}{
-//				"status": 0,
-//				"msg":    "无需关联",
-//			})
-//		}
-//	} else {
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"status": 0,
-//			"msg":    "无需关联",
-//		})
-//		return
-//	}
-//}
-//func (c *HisApiController) AssociationHisPrescription() {
-//	record_date, _ := c.GetInt64("record_date")
-//	his_patient_id, _ := c.GetInt64("his_patient_id")
-//	patient_id, _ := c.GetInt64("patient_id")
-//	p_ids := c.GetString("p_ids")
-//	p_ids_arr := strings.Split(p_ids, ",")
-//	his_patient, _ := service.GetHisPatientByIdThree(his_patient_id)
-//	if his_patient_id == 0 || his_patient.ID == 0 {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//	err := service.UpdateHisPrescriptionHisIDByPID(his_patient_id, patient_id, record_date, c.GetAdminUserInfo().CurrentOrgId, p_ids_arr)
-//	if err == nil {
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"msg": "关联处方成功",
-//		})
-//		return
-//	} else {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//		return
-//	}
-//}
+func (c *HisApiController) CheckHisPatient() {
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	patients, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient_id, recordDateTime)
+	if len(patients) > 1 {
+		ps, _ := service.GetHisPrescriptionByHisPatientID(recordDateTime, adminInfo.CurrentOrgId, patient_id)
+		if len(ps) > 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         1,
+				"msg":            "关联",
+				"ps":             ps,
+				"his_patient_id": patients[len(patients)-1].ID,
+				"patient_id":     patients[len(patients)-1].PatientId,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": 0,
+				"msg":    "无需关联",
+			})
+		}
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": 0,
+			"msg":    "无需关联",
+		})
+		return
+	}
+}
+func (c *HisApiController) AssociationHisPrescription() {
+	record_date := c.GetString("record_date")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	p_ids := c.GetString("p_ids")
+	p_ids_arr := strings.Split(p_ids, ",")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	his_patient, _ := service.GetHisPatientByIdThree(his_patient_id)
+	if his_patient_id == 0 || his_patient.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	err = service.UpdateHisPrescriptionHisIDByPID(his_patient_id, patient_id, recordDateTime, c.GetAdminUserInfo().CurrentOrgId, p_ids_arr)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "关联处方成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
 
 //func (c *HisApiController) AssociationHisPrescription() {
 //	record_date, _ := c.GetInt64("record_date")

models/his_models.go

@@ -2676,3 +2676,31 @@ type PatientTwos struct {
 func (PatientTwos) TableName() string {
 	return "xt_patients"
 }
+
+type HisPrescriptionTen 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"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	Type               int64  `gorm:"column:type" json:"type" form:"type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime            int64  `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Total              string `gorm:"-" json:"total" form:"total"`
+	PType              int64  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType            string `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	IsMedicine         int64  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+}
+
+func (HisPrescriptionTen) TableName() string {
+	return "his_prescription"
+}

service/his_service.go

@@ -2920,7 +2920,7 @@ func GetLastHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
 //}
 
 func GetHisPrescriptionByHisPatientID(record_date 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 <= ? AND p_type = ? and order_status = 1", patient_id, org_id, record_date, record_date, 1).
+	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ? AND p_type = ?", patient_id, org_id, record_date, record_date, 2).
 		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).
 				Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -2928,7 +2928,7 @@ func GetHisPrescriptionByHisPatientID(record_date int64, org_id int64, patient_i
 				}).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status = 1")
-				})
+				}).Where("status = 1 and order_status = 1")
 		}).Order("record_date desc").Find(&advice).Error
 
 	return

service/patient_service.go

@@ -1664,7 +1664,7 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 }
 
 func GetPatientByKeyWord(orgID int64, keywords string) (patient []*models.Patients, err error) {
-	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID)
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and  lapseto = 1", orgID)
 
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"