需求更改

controllers/dialysis_api_controller.go

@@ -3495,6 +3495,8 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 
 	mission := c.GetString("mission")
 	dialysis_summary := c.GetString("dialysis_summary")
+	nursingRecord := c.GetString("nursing_record")
+	specialRecord := c.GetString("special_record")
 	sj_nurse := adminUserInfo.AdminUser.Id
 	zl_nurse := adminUserInfo.AdminUser.Id
 	hd_nurse := adminUserInfo.AdminUser.Id
@@ -3514,6 +3516,8 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		ZlDoctor:        zl_doctor,
 		Status:          1,
 		CreatedTime:     time.Now().Unix(),
+		NursingRecord:   nursingRecord,
+		SpecialRecord:   specialRecord,
 	}
 
 	_, tempTreatmentSummary := service.FindTreatmentSummaryByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)

controllers/inspection_api_controller.go

@@ -226,9 +226,13 @@ func (c *InspectionApiController) CreatePatientInspection() {
 }
 
 func (c *InspectionApiController) EditPatientInspection() {
+	fmt.Println("触发了没有---------------------------------------")
 	patient, _ := c.GetInt64("patient", 0)
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
-
+	dates := c.GetString("dates")
+	projectid := c.GetString("projectid")
+	fmt.Println("日期---", dates)
+	fmt.Println("projectid", projectid)
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -445,7 +445,10 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	checkStaffId, _ := c.GetInt64("checkStaff", 0)
 	deboardNurseId, _ := c.GetInt64("deboardNurse", 0)
 	treatDoctor, _ := c.GetInt64("treatDoctor", 0)
-
+	nursingRecord := c.GetString("nursing_record")
+	fmt.Println("护理记录", nursingRecord)
+	specialRecord := c.GetString("special_record")
+	fmt.Println("特殊记录", specialRecord)
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	changeMedicalNurseId = adminUserInfo.AdminUser.Id
@@ -491,6 +494,8 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		ZlDoctor:        treatDoctor,
 		CreatedTime:     time.Now().Unix(),
 		Status:          1,
+		NursingRecord:   nursingRecord,
+		SpecialRecord:   specialRecord,
 	}
 	_, treatmentSummary := service.FindTreatmentSummaryByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if treatmentSummary.ID == 0 { //新增

controllers/patient_api_controller.go

@@ -63,7 +63,7 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/remind/is_open", &PatientApiController{}, "Post:PostIsOpenRemind")
 	beego.Router("/api/patients/advices/getpatientschedules", &PatientApiController{}, "Get:GetPatientScheduleOne")
-  beego.Router("/api/patients/advices/saveditadvices",&PatientApiController{},"Get:SaveEditAdvices")
+	beego.Router("/api/patients/advices/saveditadvices", &PatientApiController{}, "Get:SaveEditAdvices")
 }
 
 //GetPatientsList 取患者列表
@@ -235,7 +235,7 @@ func (c *PatientApiController) CreatePatient() {
 	// patient.Lapseto = 1
 
 	err := service.CreatePatient(&patient, contagions, diseases)
-	fmt.Println("创建病人失败---------------------------------------------err")
+	fmt.Println("创建病人失败err")
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePatient)
 		return
@@ -333,6 +333,7 @@ func (c *PatientApiController) CreatePatient() {
 		MemberPatienttype:            0,
 		MemberTreatement:             0,
 		EquitmentId:                  "",
+		UserSysBeforeCount:           patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -3375,28 +3376,28 @@ func (c *PatientApiController) GetPatientScheduleOne() {
 	})
 }
 
-func (c *PatientApiController) SaveEditAdvices()  {
-  adminInfo := c.GetAdminUserInfo()
-  orgid := adminInfo.CurrentOrgId
-  startTime := c.GetString("start_time")
-  fmt.Println("开始时间",startTime)
-  theTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startTime)
-  fmt.Println(theTime.Unix())
-  groupno, _ := c.GetInt64("groupno")
-  fmt.Println("组",groupno)
-  date, _ := c.GetInt64("date")
-  fmt.Println("date",date)
-  patient_id, _ := c.GetInt64("patient_id")
-  fmt.Println("paitent_id",patient_id)
-  advice := models.XtDoctorAdvice{
-    StartTime: theTime.Unix(),
-  }
-  err := service.UpdateDoctorEditAdvice(advice, orgid, groupno, date, patient_id)
-  if err != nil {
-    c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-    return
-  }
-  c.ServeSuccessJSON(map[string]interface{}{
-    "advice": advice,
-  })
+func (c *PatientApiController) SaveEditAdvices() {
+	adminInfo := c.GetAdminUserInfo()
+	orgid := adminInfo.CurrentOrgId
+	startTime := c.GetString("start_time")
+	fmt.Println("开始时间", startTime)
+	theTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startTime)
+	fmt.Println(theTime.Unix())
+	groupno, _ := c.GetInt64("groupno")
+	fmt.Println("组", groupno)
+	date, _ := c.GetInt64("date")
+	fmt.Println("date", date)
+	patient_id, _ := c.GetInt64("patient_id")
+	fmt.Println("paitent_id", patient_id)
+	advice := models.XtDoctorAdvice{
+		StartTime: theTime.Unix(),
+	}
+	err := service.UpdateDoctorEditAdvice(advice, orgid, groupno, date, patient_id)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
 }

models/dialysis.go

@@ -580,6 +580,8 @@ type TreatmentSummary struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (TreatmentSummary) TableName() string {

models/patient_models.go

@@ -485,6 +485,7 @@ type XtPatientsNew struct {
 	MemberTreatement             int64   `gorm:"column:member_treatement" json:"member_treatement" form:"member_treatement"`
 	EquitmentId                  string  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	IsExcelExport                int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
 }
 
 func (XtPatientsNew) TableName() string {

models/user_models.go

@@ -457,6 +457,8 @@ type XtTreatmentSummary struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (XtTreatmentSummary) TableName() string {

service/mobile_dialysis_service.go

@@ -650,16 +650,15 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status"`
-
+	ID              int64               `gorm:"column:id" json:"id"`
+	UserOrgId       int64               `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64               `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64               `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64               `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64               `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64               `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64               `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64               `gorm:"column:status" json:"status"`
 	DialysisOrder   *MDialysisOrderVM   `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	SchedualPatient *MSchedualPatientVM `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	DeviceNumber    *MDeviceNumberVM    `gorm:"ForeignKey:BedId" json:"device_number"`
@@ -723,6 +722,9 @@ func (MDoctorAdviceVM) TableName() string {
 func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
+	fmt.Println("advicetype", adviceType)
+	fmt.Println("patientType", patientType)
+	fmt.Println("adminUserId", adminUserId)
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -692,6 +692,8 @@ type SummerVM struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (SummerVM) TableName() string {