医嘱

controllers/doctors_api_controller.go

@@ -1488,7 +1488,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1505,6 +1506,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 		Ctime:                 time.Now().Unix(),
 		Mtime:                 0,
 		Status:                1,
+		ProjectId:             project_id,
+		InspectDate:           inspect_date,
 	}
 
 	error := service.CreatePatientFirstDisease(firstdisease)
@@ -1543,9 +1546,14 @@ func (c *DoctorsApiController) GetFirstDetailById() {
 
 	id, _ := c.GetInt64("id")
 	list, err := service.GetFirstDetailById(id)
+	ids := strings.Split(list.ProjectId, ",")
+	datelist := strings.Split(list.InspectDate, ",")
+	fmt.Println("list232323232323w", datelist)
+	inspectlist, err := service.GetInspectionItemlist(list.PatientId, datelist, ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"detail": list,
+			"detail":      list,
+			"inspectlist": inspectlist,
 		})
 		return
 	}
@@ -1571,7 +1579,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1589,6 +1598,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 		Mtime:                 0,
 		Status:                1,
 		ID:                    id,
+		InspectDate:           inspect_date,
+		ProjectId:             project_id,
 	}
 
 	error := service.UpdatePatientFirstDisease(firstdisease, id)

controllers/patient_api_controller.go

@@ -84,7 +84,7 @@ func PatientApiRegistRouters() {
 
 }
 
-//GetPatientsList 取患者列表
+// GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
 	var err error
 	defer func() {
@@ -157,7 +157,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 }
 
-//GetPatientTotal
+// GetPatientTotal
 func (c *PatientApiController) GetPatientTotal() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -182,7 +182,7 @@ func (c *PatientApiController) GetPatientsAllList() {
 	return
 }
 
-//GenerateDialysisNo 生成透析号
+// GenerateDialysisNo 生成透析号
 func (c *PatientApiController) GenerateDialysisNo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -206,7 +206,7 @@ func (c *PatientApiController) GenerateDialysisNo() {
 	return
 }
 
-//CreatePatient 创建患者
+// CreatePatient 创建患者
 func (c *PatientApiController) CreatePatient() {
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
@@ -443,7 +443,7 @@ func (c *PatientApiController) CreatePatient() {
 	return
 }
 
-//EditPatient 修改
+// EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
 
@@ -1074,7 +1074,7 @@ func (c *PatientApiController) DeleteDialysisSolution() {
 	return
 }
 
-//GetDryWeights 取患者干体重调整铺
+// GetDryWeights 取患者干体重调整铺
 func (c *PatientApiController) GetDryWeights() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
@@ -1289,9 +1289,9 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	Remark := ""
 	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
 		remark, _ := dataBody["remark"].(string)
+
 		Remark = remark
 	}
-
 	var advices []*models.GroupAdvice
 	if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
 		utils.ErrorLog("adviceNames")
@@ -1323,6 +1323,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		adviceName, _ := adviceNameM["advice_name"].(string)
+		fmt.Println("adviceceNMAE--------------------------------", adviceName)
 		if len(adviceName) == 0 {
 			utils.ErrorLog("len(advice_name) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1416,6 +1417,10 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.DrugNameId = drug_name_id
 		}
 
+		remark, _ := adviceNameM["remark"].(string)
+		fmt.Println("哦哦撒搜哦搜搜哦remark-----------------------------------", remark)
+		advice.Remark = remark
+
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -3029,7 +3034,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

models/patient_models.go

@@ -1818,6 +1818,8 @@ type XtPatientFirstDisease struct {
 	Ctime                 int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                 int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+	ProjectId             string `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	InspectDate           string `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
 }
 
 func (XtPatientFirstDisease) TableName() string {

service/patientmanage_service.go

@@ -1948,7 +1948,7 @@ func GetFirstDetailById(id int64) (models.XtPatientFirstDisease, error) {
 
 func UpdatePatientFirstDisease(disease models.XtPatientFirstDisease, id int64) error {
 
-	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan}).Error
+	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan, "project_id": disease.ProjectId, "inspect_date": disease.InspectDate}).Error
 	return err
 }