2024/6/17

controllers/his_api_controller.go

@@ -3390,7 +3390,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -641,6 +641,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	record_date, _ := c.GetInt64("record_date")
 
+	patient_id, _ := c.GetInt64("patient_id")
+
 	if origin != 2 {
 		adminUserInfo := c.GetMobileAdminUserInfo()
 		execution_staff := adminUserInfo.AdminUser.Id
@@ -672,8 +674,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		var advice models.DoctorAdvice
 
 		if groupno > 0 {
-			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 
+			fmt.Println("advices---------------------------------------------", advices)
 			for _, item := range advices {
 
 				//自备药
@@ -1184,6 +1187,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//针对普宁
 		if adminUserInfo.Org.Id != 10599 {
+			fmt.Println("开始时间--------------------", advice.StartTime)
+			fmt.Println("theTime---------------------", theTime.Unix())
 			if advice.StartTime > theTime.Unix() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 				return
@@ -1223,7 +1228,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 			}
-			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+			err = service.ExceDoctorAdviceByGroupNoOne(&advices, groupno, adminUserInfo.Org.Id, patient_id, record_date)
 
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -2345,6 +2350,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if prescribing_number_total > total_count {
+								tx.Rollback()
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "3",
 									"advice": advice,
@@ -2445,6 +2451,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 						} else {
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -2584,8 +2591,9 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
 	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
-	//patient_id, _ := c.GetInt64("patient_id")
+	patient_id, _ := c.GetInt64("patient_id")
 	advice_date, _ := c.GetInt64("advice_date")
+	record_date, _ := c.GetInt64("record_date")
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
@@ -2617,7 +2625,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	var advice models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 		for _, item := range advices {
 			if item.ExecutionState == 1 {
 				advice = item
@@ -2680,7 +2688,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 			}
 		}
-		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+		err = service.ModifyExceDoctorAdviceByGroupNoTwo(&advices, groupno, adminUserInfo.Org.Id, patient_id, record_date)
 		//记录日志
 		byterequest, _ := json.Marshal(advices)
 		adviceLog := models.XtDoctorAdviceLog{

controllers/patient_api_controller.go

@@ -168,9 +168,27 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletepatientdeathsummary", &DialysisApiController{}, "Get:DeletePatientDeathSummary")
 
-	beego.Router("/api/patient/createnewsickhistoryrecord", &DialysisApiController{}, "Post:CreateNewSickHistoryRecord")
+	beego.Router("/api/patient/createnewsickhistoryrecord", &PatientApiController{}, "Post:CreateNewSickHistoryRecord")
 
-	beego.Router("/api/patient/getnewsickhistory", &DialysisApiController{}, "Get:GetNewSickHistory")
+	beego.Router("/api/patient/getnewsickhistory", &PatientApiController{}, "Get:GetNewSickHistory")
+
+	beego.Router("/api/patient/deletenewsickhistory", &PatientApiController{}, "Get:DeleteNewSickHistory")
+
+	beego.Router("/api/patient/savesickhistorytemplate", &PatientApiController{}, "Post:SaveSickHistoryTemplate")
+
+	beego.Router("/api/patient/getsickhistorytemplate", &PatientApiController{}, "Get:GetSickHistoryTemplate")
+
+	beego.Router("/api/patient/modifysickhistorytemplate", &PatientApiController{}, "Post:ModifySickHistoryTemplate")
+
+	beego.Router("/api/patient/deletesickhistorytemplate", &PatientApiController{}, "Get:DeleteSickHistoryTemplate")
+
+	beego.Router("/api/patient/createnewcourseofdiseaserecord", &PatientApiController{}, "Post:CreateNewCourseOfDiaseaseRecord")
+
+	beego.Router("/api/patient/getpatientcourseofdiseaseslist", &PatientApiController{}, "Get:GetPatientCoureseOfDiseasesList")
+
+	beego.Router("/api/patient/deletenewcourseofdisease", &PatientApiController{}, "Get:DeleteNewCourseOfDisease")
+
+	beego.Router("/api/patient/createnewcouresetemplate", &PatientApiController{}, "Post:CreateNewCourseTemplate")
 
 }
 func (c *PatientApiController) GetExportList() {
@@ -8164,7 +8182,7 @@ func (c *DialysisApiController) DeletePatientDeathSummary() {
 	})
 }
 
-func (this *DialysisApiController) CreateNewSickHistoryRecord() {
+func (this *PatientApiController) CreateNewSickHistoryRecord() {
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
@@ -8187,6 +8205,8 @@ func (this *DialysisApiController) CreateNewSickHistoryRecord() {
 		recordDate = theTime.Unix()
 	}
 
+	id := int64(dataBody["id"].(float64))
+
 	patient_id := int64(dataBody["patient_id"].(float64))
 
 	doctor_id := int64(dataBody["doctor_id"].(float64))
@@ -8204,6 +8224,7 @@ func (this *DialysisApiController) CreateNewSickHistoryRecord() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	patientSickHistory := models.XtPatientSickHistory{
+		ID:                      id,
 		OrgId:                   orgId,
 		PatientId:               patient_id,
 		Recorder:                0,
@@ -8228,7 +8249,7 @@ func (this *DialysisApiController) CreateNewSickHistoryRecord() {
 	})
 }
 
-func (this *DialysisApiController) GetNewSickHistory() {
+func (this *PatientApiController) GetNewSickHistory() {
 
 	patient_id, _ := this.GetInt64("patient_id")
 
@@ -8240,3 +8261,185 @@ func (this *DialysisApiController) GetNewSickHistory() {
 		"list": list,
 	})
 }
+
+func (this *PatientApiController) DeleteNewSickHistory() {
+
+	id, _ := this.GetInt64("id")
+
+	service.DeleteNewSickHistory(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *PatientApiController) SaveSickHistoryTemplate() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	title := dataBody["title"].(string)
+
+	content := dataBody["content"].(string)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	sickHistoryTemplate := models.XtSickHistoryTemplate{
+		Content:   content,
+		UserOrgId: orgId,
+		Title:     title,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+		Status:    1,
+	}
+
+	service.CreateSickHistoryTemplate(sickHistoryTemplate)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sickHistoryTemplate": "sickHistoryTemplate",
+	})
+}
+
+func (this *PatientApiController) GetSickHistoryTemplate() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	templateList, _ := service.GetSickHistoryTemplate(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"templateList": templateList,
+	})
+}
+
+func (this *PatientApiController) ModifySickHistoryTemplate() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	template_id := int64(dataBody["template_id"].(float64))
+	content := dataBody["content"].(string)
+
+	service.ModifySickHistoryTemplate(template_id, content)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *PatientApiController) DeleteSickHistoryTemplate() {
+
+	template_id, _ := this.GetInt64("template_id")
+
+	service.DeleteSickHistoryTemplate(template_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *PatientApiController) CreateNewCourseOfDiaseaseRecord() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	record_date := dataBody["record_date"].(string)
+
+	id := int64(dataBody["id"].(float64))
+
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_date)
+
+	content := dataBody["content"].(string)
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patientCourse := models.PatientDiseaseCourse{
+		ID:         id,
+		OrgID:      orgId,
+		PatientID:  patient_id,
+		Recorder:   admin_user_id,
+		RecordTime: recordDate.Unix(),
+		Content:    content,
+		Status:     1,
+		CreateTime: time.Now().Unix(),
+		ModifyTime: time.Now().Unix(),
+		Title:      "",
+	}
+
+	service.CreateNewCourseOfDiaseaseRecord(patientCourse)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *PatientApiController) GetPatientCoureseOfDiseasesList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetPatientCoureseOfDiseasesList(patient_id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *PatientApiController) DeleteNewCourseOfDisease() {
+
+	id, _ := this.GetInt64("id")
+
+	service.DeleteNewCourseOfDisease(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *PatientApiController) CreateNewCourseTemplate() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	title := dataBody["title"].(string)
+
+	content := dataBody["content"].(string)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	courseTemplate := models.XtPatientCourseTemplate{
+		Content:   content,
+		UserOrgId: orgId,
+		Title:     title,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	service.CreateCourseTemplate(courseTemplate)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

models/data_models.go

@@ -19,6 +19,7 @@ type Dataconfig struct {
 	Order          int64  `gorm:"column:orders" json:"orders" form:"orders"`
 	Code           string `gorm:"column:code" json:"code" form:"code"`
 	FieldType      int64  `gorm:"column:field_type" json:"field_type" form:"field_type"`
+	Sort           int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (Dataconfig) TableName() string {
@@ -97,22 +98,24 @@ func (DictionaryConfigViewModel) TableName() string {
 }
 
 type ConfigViewModel struct {
-	ID           int64         `gorm:"column:id" json:"id" form:"id"`
-	ParentId     int64         `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	Module       string        `gorm:"column:module" json:"module" form:"module"`
-	OrgId        int64         `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Name         string        `gorm:"column:name" json:"name" form:"name"`
-	FieldName    string        `gorm:"column:field_name" json:"field_name" form:"field_name"`
-	Value        int           `gorm:"column:value" json:"value" form:"value"`
-	CreatedTime  string        `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	UpdatedTime  string        `gorm:"column:update_time" json:"update_time" form:"update_time"`
-	CreateUserId int64         `gorm:"column:create_user_id" json:"create_user_id" form:"create_user_id"`
-	Status       int64         `gorm:"column:status" json:"status" form:"status"`
-	Remark       string        `gorm:"column:remark" json:"remark" form:"remark"`
-	Title        string        `gorm:"column:title" json:"title" form:"title"`
-	Content      string        `gorm:"column:content" json:"content" form:"content"`
-	Order        int64         `gorm:"column:orders" json:"orders" form:"orders"`
-	Childs       []*Dataconfig `json:"childs" `
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	ParentId     int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Module       string `gorm:"column:module" json:"module" form:"module"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	FieldName    string `gorm:"column:field_name" json:"field_name" form:"field_name"`
+	Value        int    `gorm:"column:value" json:"value" form:"value"`
+	CreatedTime  string `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdatedTime  string `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	CreateUserId int64  `gorm:"column:create_user_id" json:"create_user_id" form:"create_user_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Remark       string `gorm:"column:remark" json:"remark" form:"remark"`
+	Title        string `gorm:"column:title" json:"title" form:"title"`
+	Content      string `gorm:"column:content" json:"content" form:"content"`
+	Order        int64  `gorm:"column:orders" json:"orders" form:"orders"`
+	Sort         int64  `gorm:"column:sort" json:"sort" form:"sort"`
+
+	Childs []*Dataconfig `json:"childs" `
 }
 
 func (ConfigViewModel) TableName() string {

models/inspection_models.go

@@ -70,6 +70,7 @@ type InspectionReference struct {
 	UpdatedTime      int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	SystemProjectId  int64  `gorm:"column:system_project_id" json:"system_project_id" form:"system_project_id"`
 	SystemItemId     int64  `gorm:"column:system_item_id" json:"system_item_id" form:"system_item_id"`
+	Sort             int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	//remind 	 XtCheckRemind   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"good_info"`
 }
 

models/patient_models.go

@@ -2830,3 +2830,33 @@ func (XtDeathSummary) TableName() string {
 
 	return "xt_death_summary"
 }
+
+type XtSickHistoryTemplate struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	Content   string `gorm:"column:content" json:"content" form:"content"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Title     string `gorm:"column:title" json:"title" form:"title"`
+	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"`
+}
+
+func (XtSickHistoryTemplate) TableName() string {
+
+	return "xt_sick_history_template"
+}
+
+type XtPatientCourseTemplate struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	Content   string `gorm:"column:content" json:"content" form:"content"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Title     string `gorm:"column:title" json:"title" form:"title"`
+	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"`
+}
+
+func (XtPatientCourseTemplate) TableName() string {
+
+	return "xt_patient_course_template"
+}

service/data.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
-	_ "github.com/astaxie/beego"
 	_ "strconv"
 	_ "strings"
 	"time"
+
+	"XT_New/models"
+	_ "github.com/astaxie/beego"
 )
 
 // GetPatientList 返回患者的列表
@@ -48,6 +49,7 @@ func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 				Remark:       config.Remark,
 				Title:        config.Title,
 				Content:      config.Content,
+				Sort:         config.Sort,
 			}
 			// configResult = append(configResult,newConfig)
 			result := resultConfig[config.Module]

service/dialysis_service.go

@@ -980,6 +980,12 @@ func ExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int
 	return err
 }
 
+func ExceDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, groupNo int64, org_id int64, patient_id int64, record_date int64) (err error) {
+
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 1 AND execution_state = 2 and patient_id = ? and advice_date = ?", groupNo, org_id, patient_id, record_date).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	return err
+}
+
 func GetExceDoctorAdviceGroupNo(groupNo int64, org_id int64) (advice []*models.DoctorAdvice, err error) {
 
 	err = XTReadDB().Where("groupno = ?  AND user_org_id = ? AND status = 1", groupNo, org_id).Find(&advice).Error
@@ -1195,6 +1201,18 @@ func ModifyExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_
 	return err
 }
 
+func ModifyExceDoctorAdviceByGroupNoTwo(m *models.DoctorAdvice, groupNo int64, org_id int64, patient_id int64, advice_date int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 1 AND execution_state = 1 and patient_id = ? and advice_date = ?", groupNo, org_id, patient_id, advice_date).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return err
+}
+
 func ModifyExceDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DoctorAdvice{}).Where("id in(?) and status =1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error

service/inspection_service.go

@@ -398,7 +398,7 @@ func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64)
 
 func GetInSpctionRerefce(project_id int64, user_org_id int64) (inspct []*models.InspectionReference, err error) {
 
-	err = XTReadDB().Where("project_id = ? and (org_id = ? or org_id=0) and status =1", project_id, user_org_id).Find(&inspct).Error
+	err = XTReadDB().Where("project_id = ? and (org_id = ? or org_id=0) and status =1", project_id, user_org_id).Order("sort desc").Find(&inspct).Error
 	return inspct, err
 }
 

service/patient_service.go

@@ -1786,6 +1786,11 @@ func FindAllDoctorAdviceByGoroupNoOne(orgID int64, groupno int64) (advice []mode
 	return
 }
 
+func FindAllDoctorAdviceByGoroupNoThree(orgID int64, groupno int64, patient_id int64, advice_date int64) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and patient_id =? and advice_date =?", orgID, groupno, patient_id, advice_date).Find(&advice).Error
+	return
+}
+
 func UpdateDoctorAdviceByGoroupNo(id int64, drug_id int64) error {
 
 	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"drug_id": drug_id, "drug_name_id": drug_id, "way": 1}).Error
@@ -4395,7 +4400,7 @@ func DeletePatientDeathSummary(id int64) error {
 
 func CreateNewSickHistoryRecord(history models.XtPatientSickHistory) error {
 
-	err := XTWriteDB().Create(&history).Error
+	err := XTWriteDB().Save(&history).Error
 
 	return err
 }
@@ -4406,3 +4411,66 @@ func GetNewSickHistory(patient_id int64, org_id int64) (sick []*models.XtPatient
 
 	return sick, err
 }
+
+func DeleteNewSickHistory(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtPatientSickHistory{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func CreateSickHistoryTemplate(template models.XtSickHistoryTemplate) error {
+
+	err := XTWriteDB().Create(&template).Error
+
+	return err
+}
+
+func GetSickHistoryTemplate(user_org_id int64) (template []*models.XtSickHistoryTemplate, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&template).Error
+
+	return template, err
+}
+
+func ModifySickHistoryTemplate(id int64, content string) error {
+
+	err := XTReadDB().Model(&models.XtSickHistoryTemplate{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+	return err
+}
+
+func DeleteSickHistoryTemplate(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSickHistoryTemplate{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func CreateNewCourseOfDiaseaseRecord(course models.PatientDiseaseCourse) error {
+
+	err := XTWriteDB().Save(&course).Error
+
+	return err
+}
+
+func GetPatientCoureseOfDiseasesList(patient_id int64, org_id int64) (list []*models.PatientDiseaseCourse, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and status=1", patient_id, org_id).Find(&list).Error
+
+	return list, err
+
+}
+
+func DeleteNewCourseOfDisease(id int64) error {
+
+	patientCourse := models.PatientDiseaseCourse{}
+	err := XTWriteDB().Model(&patientCourse).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateCourseTemplate(course models.XtPatientCourseTemplate) error {
+
+	err := XTWriteDB().Create(&course).Error
+
+	return err
+}