---

controllers/patient_dataconfig_api_controller.go

@@ -33,12 +33,52 @@ func PatientDataConfigAPIControllerRegistRouters() {
 	beego.Router("/api/patient/physiquecheck/delete", &PatientDataConfigAPIController{}, "post:DeletePhysiqueCheck")
 	beego.Router("/api/patient/physiquecheck/modify", &PatientDataConfigAPIController{}, "get:ModifyPhysiqueCheck")
 
+	beego.Router("/api/patient/sickhistory/print", &PatientDataConfigAPIController{}, "get:GetSickhistoryPrints")
+	beego.Router("/api/patient/physiquecheck/print", &PatientDataConfigAPIController{}, "get:GetPhysiquecheckPrints")
+
 }
 
 type PatientDataConfigAPIController struct {
 	BaseAuthAPIController
 }
 
+func (this *PatientDataConfigAPIController) GetPhysiquecheckPrints() {
+
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordIDStrs := strings.Split(idsStr, ",")
+	patient, _ := service.GetPatientByID(this.GetAdminUserInfo().CurrentOrgId, patientID)
+	sickHostory, _ := service.GetPatienttPhysiqueByIds(this.GetAdminUserInfo().CurrentOrgId, patientID, recordIDStrs)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":      patient,
+		"sickhistorys": sickHostory,
+	})
+
+}
+func (this *PatientDataConfigAPIController) GetSickhistoryPrints() {
+	patientID, _ := this.GetInt64("patient_id")
+	idsStr := this.GetString("ids")
+	if patientID <= 0 || len(idsStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordIDStrs := strings.Split(idsStr, ",")
+	patient, _ := service.GetPatientByID(this.GetAdminUserInfo().CurrentOrgId, patientID)
+	sickHostory, _ := service.GetPatientSickHistoryByIds(this.GetAdminUserInfo().CurrentOrgId, patientID, recordIDStrs)
+	for _, item := range sickHostory {
+		pc, _ := service.GetLastPatientPhysiqueCheck(this.GetAdminUserInfo().CurrentOrgId, item.PatientId, item.RecordDate)
+		item.XtPatientPhysiqueCheck = pc
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":      patient,
+		"sickhistorys": sickHostory,
+	})
+}
+
 func (this *PatientDataConfigAPIController) GetSickHistorys() {
 	patientID, _ := this.GetInt64("patient_id")
 	startTimeYMDStr := this.GetString("start_time")
@@ -105,8 +145,10 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	record_date := strings.Split(record_time_str, " ")
 
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
+	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
@@ -135,6 +177,7 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 		Ctime:                   now,
 		Mtime:                   now,
 		DoctorId:                doctor_id,
+		RecordDate:              checkDate_two.Unix(),
 	}
 
 	createErr := service.CreatePatientSickHistory(&record)
@@ -369,7 +412,9 @@ func (this *PatientDataConfigAPIController) CreatePhysiqueCheck() {
 		return
 	}
 
+	record_date := strings.Split(record_time_str, " ")
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
+	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
@@ -442,6 +487,7 @@ func (this *PatientDataConfigAPIController) CreatePhysiqueCheck() {
 		ShenzhangYatong:  shenzhang_yatong,
 		FubuDesc:         fubu_desc,
 		OthDesc:          oth_desc,
+		RecordDate:       checkDate_two.Unix(),
 	}
 	createErr := service.CreatePatientPhysiqueCheck(&record)
 	if createErr != nil {

controllers/public_api_controller.go

@@ -115,23 +115,23 @@ func (c *PublicApiController) HandleSchedule() {
 
 func (c *PublicApiController) HandleOne() {
 	//fmt.Println("~~~~~~")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	if err != nil {
-	}
-	startRecordDateTime := startTime.Unix()
-	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	if err != nil {
-	}
-	endRecordDateTime := endTime.Unix()
-	orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"order": orders,
-	})
+	//start_time := c.GetString("start_time")
+	//end_time := c.GetString("end_time")
+	//
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//if err != nil {
+	//}
+	//startRecordDateTime := startTime.Unix()
+	//endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	//if err != nil {
+	//}
+	//endRecordDateTime := endTime.Unix()
+	//orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"order": orders,
+	//})
 }
 
 //func (c *PublicApiController) HandleScheduleTwo() {

models/patient_models.go

@@ -1828,21 +1828,23 @@ func (XtPatientFirstDisease) TableName() string {
 }
 
 type XtPatientSickHistory struct {
-	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
-	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Recorder                int64  `gorm:"column:recorder" json:"recorder" form:"recorder"`
-	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
-	Content                 string `gorm:"column:content" json:"content" form:"content"`
-	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"`
-	Title                   string `gorm:"column:title" json:"title" form:"title"`
-	IsShenyizhiHistory      int64  `gorm:"column:is_shenyizhi_history" json:"is_shenyizhi_history" form:"is_shenyizhi_history"`
-	IsFumoDialysisHistory   int64  `gorm:"column:is_fumo_dialysis_history" json:"is_fumo_dialysis_history" form:"is_fumo_dialysis_history"`
-	HypersusceptibilityDesc string `gorm:"column:hypersusceptibility_desc" json:"hypersusceptibility_desc" form:"hypersusceptibility_desc"`
-	DoctorId                int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	IsHypersusceptibility   int64  `gorm:"column:is_hypersusceptibility" json:"is_hypersusceptibility" form:"is_hypersusceptibility"`
+	ID                      int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrgId                   int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	PatientId               int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Recorder                int64                  `gorm:"column:recorder" json:"recorder" form:"recorder"`
+	RecordTime              int64                  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	RecordDate              int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Content                 string                 `gorm:"column:content" json:"content" form:"content"`
+	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"`
+	Title                   string                 `gorm:"column:title" json:"title" form:"title"`
+	IsShenyizhiHistory      int64                  `gorm:"column:is_shenyizhi_history" json:"is_shenyizhi_history" form:"is_shenyizhi_history"`
+	IsFumoDialysisHistory   int64                  `gorm:"column:is_fumo_dialysis_history" json:"is_fumo_dialysis_history" form:"is_fumo_dialysis_history"`
+	HypersusceptibilityDesc string                 `gorm:"column:hypersusceptibility_desc" json:"hypersusceptibility_desc" form:"hypersusceptibility_desc"`
+	DoctorId                int64                  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	IsHypersusceptibility   int64                  `gorm:"column:is_hypersusceptibility" json:"is_hypersusceptibility" form:"is_hypersusceptibility"`
+	XtPatientPhysiqueCheck  XtPatientPhysiqueCheck `gorm:"json:"ppc"`
 }
 
 func (XtPatientSickHistory) TableName() string {
@@ -1850,11 +1852,13 @@ func (XtPatientSickHistory) TableName() string {
 }
 
 type XtPatientPhysiqueCheck struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	PatientId        int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Recorder         int64  `gorm:"column:recorder" json:"recorder" form:"recorder"`
-	RecordTime       int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Recorder   int64 `gorm:"column:recorder" json:"recorder" form:"recorder"`
+	RecordTime int64 `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+
 	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"`

service/patient_dataconfig_service.go

@@ -38,6 +38,24 @@ func GetPatientSickHistory(orgID int64, patientID int64, startTime int64, endTim
 	return records, nil
 }
 
+func GetPatientSickHistoryByIds(orgID int64, patientID int64, ids []string) ([]*models.XtPatientSickHistory, error) {
+	var records []*models.XtPatientSickHistory
+	err := readDb.Model(&models.XtPatientSickHistory{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, ids).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
+func GetPatienttPhysiqueByIds(orgID int64, patientID int64, ids []string) ([]*models.XtPatientPhysiqueCheck, error) {
+	var records []*models.XtPatientPhysiqueCheck
+	err := readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, ids).Order("record_time desc").Find(&records).Error
+	if err != nil {
+		return nil, err
+	}
+	return records, nil
+}
+
 func GetPatientPhysiqueCheck(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.XtPatientPhysiqueCheck, error) {
 	var records []*models.XtPatientPhysiqueCheck
 	err := readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error
@@ -47,6 +65,11 @@ func GetPatientPhysiqueCheck(orgID int64, patientID int64, startTime int64, endT
 	return records, nil
 }
 
+func GetLastPatientPhysiqueCheck(orgID int64, patientID int64, record_date int64) (records models.XtPatientPhysiqueCheck, err error) {
+	err = readDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and record_date = ? and status = 1", orgID, patientID, record_date).Order("record_time desc").Last(&records).Error
+	return records, err
+}
+
 func CreatePatientCourseOfDisease(record *models.PatientDiseaseCourse) error {
 	err := writeDb.Model(&models.PatientDiseaseCourse{}).Create(record).Error
 	return err