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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10402 //机构id
+		subscibe.OrgId = 10702 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10402 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10402 //机构id小英9675或4
+		subscibe.OrgId = 10702 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10402 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -327,13 +327,6 @@ func (c *DialysisApiController) PostPrescription() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 
-	//heparin_sodium := c.GetString("heparin_sodium")
-	//fmt.Println("肝素钠",heparin_sodium)
-	//nucleoprotamine := c.GetString("nucleoprotamine")
-	//fmt.Println("鱼精蛋白",nucleoprotamine)
-	//push_the_protamine := c.GetString("push_the_protamine")
-	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
-	// var prescription_doctor int64
 	blood := c.GetString("blood")
 	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
 
@@ -383,6 +376,12 @@ func (c *DialysisApiController) PostPrescription() {
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	dialyzate := c.GetString("dialyzate")
+
+	first_super, _ := c.GetInt64("first_super")
+	is_sequential, _ := c.GetInt64("is_sequential")
+
+	conduct := c.GetString("conduct")
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -528,6 +527,9 @@ func (c *DialysisApiController) PostPrescription() {
 		DialysisStrainerId:         dialysis_strainer_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisDialyszersId:       dialysis_dialyszers_id,
+		FirstSuper:                 first_super,
+		IsSequential:               is_sequential,
+		Conduct:                    conduct,
 	}
 
 	if adminUserInfo.CurrentOrgId == 10721 {
@@ -1147,6 +1149,12 @@ func (c *DialysisApiController) PostSoulution() {
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	dialyzate := c.GetString("dialyzate")
+
+	first_super, _ := c.GetInt64("first_super")
+	is_sequential, _ := c.GetInt64("is_sequential")
+
+	conduct := c.GetString("conduct")
+
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1342,6 +1350,9 @@ func (c *DialysisApiController) PostSoulution() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisStrainerId:         dialysis_strainer_id,
+		FirstSuper:                 first_super,
+		IsSequential:               is_sequential,
+		Conduct:                    conduct,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1556,6 +1567,9 @@ func (c *DialysisApiController) PostSoulution() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisStrainerId:         dialysis_strainer_id,
+		FirstSuper:                 first_super,
+		IsSequential:               is_sequential,
+		Conduct:                    conduct,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -2316,6 +2330,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 	patient, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
+	record_time := c.GetString("record_time")
 	fmt.Println(recordDateStr)
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2338,6 +2353,10 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		return
 	}
 
+	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_time)
+
+	fmt.Println("startDate0000000000000000000000000000", startDate.Unix())
+
 	// data := make(map[string]interface{}, 0)
 	var data models.AssessmentAfterDislysis
 	var err error
@@ -2427,6 +2446,8 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.Condenser = data.Condenser
 	assessment.LastAfterWeight = data.LastAfterWeight
 	assessment.DisplaceLiquiValue = data.DisplaceLiquiValue
+	assessment.RecordTime = startDate.Unix()
+	assessment.SymptomAfterDialysisRemark = data.SymptomAfterDialysisRemark
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

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 {
+	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{})
 
@@ -3909,15 +3909,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											return
 
 										}
-
-										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
-
-										if drugMedical.SumCount == 0 {
-											tx.Rollback()
-											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
-											return
-
-										}
 									}
 								}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1554,6 +1554,8 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	transfusion_volume := c.GetString("transfusion_volume")
 	last_after_weight := c.GetString("last_after_weight")
 	displace_liqui_value := c.GetString("displace_liqui_value")
+	start_time := c.GetString("start_time")
+	symptom_after_dialysis_remark := c.GetString("symptom_after_dialysis_remark")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1577,6 +1579,9 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
+	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", start_time)
+
 	//now := time.Now()
 	//year, month, day := now.Date()
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
@@ -1664,6 +1669,8 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		TransfusionVolume:            transfusion_volume,
 		LastAfterWeight:              last_after_weight,
 		DisplaceLiquiValue:           displace_liqui_value,
+		RecordTime:                   startDate.Unix(),
+		SymptomAfterDialysisRemark:   symptom_after_dialysis_remark,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -2075,6 +2082,32 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	dialyzate := c.GetString("dialyzate")
+	first_super := c.GetString("first_super")
+
+	var first_sup int64
+	if first_super == "是" {
+		first_sup = 1
+	}
+	if first_super == "否" {
+		first_sup = 2
+	}
+	if first_super == "请选择" {
+		first_sup = 0
+	}
+	is_sequential := c.GetString("is_sequential")
+
+	var is_sequent int64
+	if is_sequential == "是" {
+		is_sequent = 1
+	}
+	if is_sequential == "否" {
+		is_sequent = 2
+	}
+	if is_sequential == "请选择" {
+		is_sequent = 0
+	}
+
+	conduct := c.GetString("conduct")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -2262,6 +2295,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisStrainerId:         dialysis_strainer_id,
+		FirstSuper:                 first_sup,
+		IsSequential:               is_sequent,
+		Conduct:                    conduct,
 	}
 
 	if adminUserInfo.Org.Id == 10721 {
@@ -4365,6 +4401,31 @@ func (c *DialysisAPIController) PostSolution() {
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
 	dialyzate := c.GetString("dialyzate")
+	first_super := c.GetString("first_super")
+	is_sequential := c.GetString("is_sequential")
+
+	var fisrt_sup int64
+	if first_super == "是" {
+		fisrt_sup = 1
+	}
+	if first_super == "否" {
+		fisrt_sup = 2
+	}
+	if first_super == "请选择" {
+		fisrt_sup = 0
+	}
+
+	var is_sequen int64
+	if is_sequential == "是" {
+		is_sequen = 1
+	}
+	if is_sequential == "否" {
+		is_sequen = 2
+	}
+	if is_sequential == "请选择" {
+		is_sequen = 0
+	}
+	conduct := c.GetString("conduct")
 	if mode_id > 0 {
 
 		var str string
@@ -4550,6 +4611,9 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisStrainerId:         dialysis_strainer_id,
+		FirstSuper:                 fisrt_sup,
+		IsSequential:               is_sequen,
+		Conduct:                    conduct,
 	}
 
 	if adminUserInfo.Org.Id == 10721 {
@@ -4691,6 +4755,9 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 		DialysisIrrigationId:       dialysis_irrigation_id,
 		DialysisStrainerId:         dialysis_strainer_id,
+		FirstSuper:                 fisrt_sup,
+		IsSequential:               is_sequen,
+		Conduct:                    conduct,
 	}
 
 	//针对河间咸的

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{
@@ -6743,6 +6751,9 @@ func (c *PatientApiController) ExecProject() {
 	team_id, _ := c.GetInt64("team_id")
 	is_check_team, _ := c.GetInt64("is_check_team")
 
+	record_date, _ := c.GetInt64("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+
 	if len(execution_time) <= 0 {
 		utils.ErrorLog("execution_time")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -6920,7 +6931,8 @@ func (c *PatientApiController) ExecProject() {
 
 				}
 			}
-			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			ps, _ := service.GetCheckTeamProjectOne(team_id, patient_id, record_date, adminInfo.Org.Id)
+
 			var ids []int64
 			for _, items := range ps {
 				ids = append(ids, items.ID)
@@ -6947,6 +6959,9 @@ func (c *PatientApiController) CheckProject() {
 	team_id, _ := c.GetInt64("team_id")
 	is_check_team, _ := c.GetInt64("is_check_team")
 
+	record_date, _ := c.GetInt64("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.CheckState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
@@ -7062,7 +7077,7 @@ func (c *PatientApiController) CheckProject() {
 
 				}
 			}
-			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			ps, _ := service.GetCheckTeamProjectOne(team_id, patient_id, record_date, adminInfo.Org.Id)
 			var ids []int64
 			for _, items := range ps {
 				ids = append(ids, items.ID)

controllers/patient_api_controller.go

@@ -168,6 +168,40 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletepatientdeathsummary", &DialysisApiController{}, "Get:DeletePatientDeathSummary")
 
+	beego.Router("/api/patient/createnewsickhistoryrecord", &PatientApiController{}, "Post:CreateNewSickHistoryRecord")
+
+	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")
+
+	beego.Router("/api/patient/savepatientdeathrecord", &PatientApiController{}, "Post:SavePatientDeathRecord")
+
+	beego.Router("/api/patient/getpatientdeathrecord", &PatientApiController{}, "Get:GetPatientDeathRecordOne")
+
+	beego.Router("/api/patient/savecouresetemplatetitle", &PatientApiController{}, "Post:SaveCoureseTemplateTitle")
+
+	beego.Router("/api/patient/getpatientcourseoftemplate", &PatientApiController{}, "Get:GetPatientCourseOfTemplate")
+
+	beego.Router("/api/patient/savecourseofnewtemplate", &PatientApiController{}, "Post:SaveCourseOfNewTemplate")
+
+	beego.Router("/api/patient/deletecourestempalte", &PatientApiController{}, "Get:DeleteCouseTemplate")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -6331,68 +6365,31 @@ func (c *PatientApiController) ExportPatients() {
 			if patientNameM["id_card_no"] != nil || reflect.TypeOf(patientNameM["id_card_no"]).String() == "string" {
 				id_card_no, _ := patientNameM["id_card_no"].(string)
 
-				if IsIdCard(id_card_no) == false { //身份证号码不符合要求则生成一条导入错误日志
-
-					if len(id_card_no) == 0 {
-						err_log := models.ExportErrLog{
-							LogType:    1,
-							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-							ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的身份证号码不能为空",
-							Status:     1,
-							CreateTime: time.Now().Unix(),
-							UpdateTime: time.Now().Unix(),
-							ExportTime: export_time,
-						}
-						service.CreateExportErrLog(&err_log)
-						continue
-
-					} else {
-						err_log := models.ExportErrLog{
-							LogType:    1,
-							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-							ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的身份证号码格式不符合要求",
-							Status:     1,
-							CreateTime: time.Now().Unix(),
-							UpdateTime: time.Now().Unix(),
-							ExportTime: export_time,
-						}
-						service.CreateExportErrLog(&err_log)
-						continue
-
+				count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+				if count >= 1 {
+					//if tempPatient != nil && tempPatient.ID > 0 {
+					err_log := models.ExportErrLog{
+						LogType:    1,
+						UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的身份证号码在系统中已经存在",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
 					}
-
+					service.CreateExportErrLog(&err_log)
+					continue
+				}
+				//}
+				patient.IdCardNo = id_card_no
+				//patient.Birthday = GetBirthDay(id_card_no).Unix()
+				if GetBirthDay(id_card_no) == nil {
+					patient.Birthday = 0
 				} else {
-					//var tempPatient *models.Patients
-					//for _, item := range all_patient {
-					//	if item.IdCardNo == id_card_no {
-					//		tempPatient = item
-					//	}
-					//}
-					count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-					if count >= 1 {
-						//if tempPatient != nil && tempPatient.ID > 0 {
-						err_log := models.ExportErrLog{
-							LogType:    1,
-							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-							ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的身份证号码在系统中已经存在",
-							Status:     1,
-							CreateTime: time.Now().Unix(),
-							UpdateTime: time.Now().Unix(),
-							ExportTime: export_time,
-						}
-						service.CreateExportErrLog(&err_log)
-						continue
-					}
-					//}
-					patient.IdCardNo = id_card_no
-					//patient.Birthday = GetBirthDay(id_card_no).Unix()
-					if GetBirthDay(id_card_no) == nil {
-						patient.Birthday = 0
-					} else {
-						patient.Birthday = GetBirthDay(id_card_no).Unix()
+					patient.Birthday = GetBirthDay(id_card_no).Unix()
 
-					}
 				}
+
 			}
 
 			fmt.Println("111112222")
@@ -8159,3 +8156,373 @@ func (c *DialysisApiController) DeletePatientDeathSummary() {
 		"msg": "删除成功",
 	})
 }
+
+func (this *PatientApiController) CreateNewSickHistoryRecord() {
+
+	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
+	}
+
+	record_date := dataBody["record_time"].(string)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
+
+	id := int64(dataBody["id"].(float64))
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	doctor_id := int64(dataBody["doctor_id"].(float64))
+
+	guominyaowu_desc := dataBody["guominyaowu_desc"].(string)
+
+	is_fumotouxishi := int64(dataBody["is_fumotouxishi"].(float64))
+
+	is_guominyaowu := int64(dataBody["is_guominyaowu"].(float64))
+
+	is_shenyizhishi := int64(dataBody["is_shenyizhishi"].(float64))
+
+	content := dataBody["content"].(string)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patientSickHistory := models.XtPatientSickHistory{
+		ID:                      id,
+		OrgId:                   orgId,
+		PatientId:               patient_id,
+		Recorder:                0,
+		RecordTime:              recordDate,
+		RecordDate:              recordDate,
+		Content:                 content,
+		Status:                  1,
+		Ctime:                   time.Now().Unix(),
+		Mtime:                   time.Now().Unix(),
+		Title:                   "",
+		IsShenyizhiHistory:      is_shenyizhishi,
+		IsFumoDialysisHistory:   is_fumotouxishi,
+		HypersusceptibilityDesc: guominyaowu_desc,
+		DoctorId:                doctor_id,
+		IsHypersusceptibility:   is_guominyaowu,
+	}
+
+	service.CreateNewSickHistoryRecord(patientSickHistory)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientSickHistory": patientSickHistory,
+	})
+}
+
+func (this *PatientApiController) GetNewSickHistory() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetNewSickHistory(patient_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"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",
+	})
+}
+
+func (this *PatientApiController) SavePatientDeathRecord() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	content := dataBody["content"].(string)
+
+	dialyszerinformedPrint := models.XtDeathRecord{
+		UserOrgId: orgId,
+		Content:   content,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	informed, _ := service.GetPatientDeathRecord(orgId)
+
+	if informed.ID == 0 {
+
+		service.CreatePatientDeathRecord(dialyszerinformedPrint)
+	}
+
+	if informed.ID > 0 {
+		service.UpdatePatientDeathRecord(informed.ID, content)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": dialyszerinformedPrint,
+	})
+}
+
+func (this *PatientApiController) GetPatientDeathRecordOne() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	record, _ := service.GetPatientDeathRecordList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record": record,
+	})
+}
+
+func (this *PatientApiController) SaveCoureseTemplateTitle() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	title := dataBody["title"].(string)
+	content := dataBody["content"].(string)
+
+	courseTemplate := models.XtPatientCourseTemplate{
+		Content:   content,
+		UserOrgId: orgId,
+		Title:     title,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	service.SaveCoureseTemplateTitle(courseTemplate)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"courseTemplate": courseTemplate,
+	})
+
+}
+
+func (this *PatientApiController) GetPatientCourseOfTemplate() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetPatientCourseOfTemplate(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"templateList": list,
+	})
+}
+
+func (this *PatientApiController) SaveCourseOfNewTemplate() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	id := int64(dataBody["template_id"].(float64))
+	content := dataBody["content"].(string)
+
+	service.SaveCourseOfNewTemplate(id, content)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *PatientApiController) DeleteCouseTemplate() {
+
+	id, _ := this.GetInt64("id")
+
+	fmt.Println("id==================", id)
+	service.DeleteCouseTemplate(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}

controllers/stock_in_api_controller.go

@@ -1260,7 +1260,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 	if warehouseOut_id == 0 {
 		//查询是否生成出库单
-		warehouseOutObj, _ := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+		warehouseOutObj, _ := service.FindStockOutByIsSysOne(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order)
 
 		if warehouseOutObj.ID == 0 {
 			service.AddSigleWarehouseOut(&warehouseOut)
@@ -1316,7 +1316,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
-				total := float64(count) * price
+				total_one := float64(count) * price
 				remark := items["remark"].(string)
 
 				manufacturer := int64(items["manufacturer"].(float64))
@@ -1378,7 +1378,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					GoodTypeId:              good_type_id,
 					Count:                   count,
 					Price:                   price,
-					TotalPrice:              total,
+					TotalPrice:              total_one,
 					Status:                  1,
 					Ctime:                   ctime,
 					Remark:                  remark,
@@ -1409,46 +1409,54 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 	goodWarehouseOut, _ := service.GetLastGoodWarehouseOutTwenty(adminUserInfo.CurrentOrgId)
 
-	for _, it := range warehousingOutInfo {
-		warehouseOutInfo := &models.WarehouseOutInfo{
-			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          goodWarehouseOut.ID,
-			WarehouseInfotId:        0,
-			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Remark:                  it.Remark,
-			OrgId:                   adminUserInfo.CurrentOrgId,
-			Type:                    1,
-			Manufacturer:            it.Manufacturer,
-			Dealer:                  it.Dealer,
-			IsSys:                   0,
-			SysRecordTime:           it.SysRecordTime,
-			GoodTypeId:              it.GoodTypeId,
-			GoodId:                  it.GoodId,
-			ExpiryDate:              it.ExpiryDate,
-			ProductDate:             it.ProductDate,
-			Number:                  it.Number,
-			Price:                   it.Price,
-			LicenseNumber:           it.LicenseNumber,
-			SupplyWarehouseId:       0,
-			StorehouseId:            storehouse_id,
-			AdminUserId:             it.AdminUserId,
-			BuyPrice:                it.BuyPrice,
-			StockCount:              it.StockCount,
-			Count:                   it.Count,
-			IsCheck:                 2,
-			RegisterNumber:          it.RegisterNumber,
-			PatientId:               it.PatientId,
-			ClassType:               it.ClassType,
-		}
-		if it.ID == 0 {
-			service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-
-		}
-		if it.ID > 0 {
-			service.ModifyWarehouseOutInfo(it.ID, warehouseOutInfo)
+	if len(warehousingOutInfo) > 0 {
+		for _, it := range warehousingOutInfo {
+			warehouseOutInfo := &models.WarehouseOutInfo{
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				WarehouseOutId:          goodWarehouseOut.ID,
+				WarehouseInfotId:        0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Remark:                  it.Remark,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Type:                    1,
+				Manufacturer:            it.Manufacturer,
+				Dealer:                  it.Dealer,
+				IsSys:                   0,
+				SysRecordTime:           it.SysRecordTime,
+				GoodTypeId:              it.GoodTypeId,
+				GoodId:                  it.GoodId,
+				ExpiryDate:              it.ExpiryDate,
+				ProductDate:             it.ProductDate,
+				Number:                  it.Number,
+				Price:                   it.Price,
+				LicenseNumber:           it.LicenseNumber,
+				SupplyWarehouseId:       0,
+				StorehouseId:            storehouse_id,
+				AdminUserId:             it.AdminUserId,
+				BuyPrice:                it.BuyPrice,
+				StockCount:              it.StockCount,
+				Count:                   it.Count,
+				IsCheck:                 2,
+				RegisterNumber:          it.RegisterNumber,
+				PatientId:               it.PatientId,
+				ClassType:               it.ClassType,
+			}
+			if it.ID == 0 {
+
+				//查询改耗材是否出库
+				outInfo, _ := service.GetGoodsIsExsit(it.GoodId, it.SysRecordTime, it.OrgId, goodWarehouseOut.ID)
+				if outInfo.ID == 0 {
+					service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+				}
+
+			}
+			if it.ID > 0 {
+				service.ModifyWarehouseOutInfo(it.ID, warehouseOutInfo)
+			}
 		}
 	}
+
 	appId := adminUserInfo.CurrentAppId
 
 	warehouseOutInfoList, _ := service.GetLastGoodWarehouseOutInfo(adminUserInfo.CurrentOrgId, goodWarehouseOut.ID)
@@ -1862,7 +1870,12 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		}
 
 		for _, item := range warehousingOutInfo {
-			service.AddSigleWarehouseOutInfo(item)
+			//查询改耗材是否出库
+			outInfo, _ := service.GetGoodsIsExsit(item.GoodId, item.SysRecordTime, item.OrgId, item.WarehouseOutId)
+			if outInfo.ID == 0 {
+				service.AddSigleWarehouseOutInfo(item)
+			}
+
 		}
 	}
 

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/dialysis.go

@@ -660,6 +660,8 @@ type AssessmentAfterDislysis struct {
 	Condenser                       string  `gorm:"column:condenser" json:"condenser" form:"condenser"`
 	LastAfterWeight                 string  `gorm:"column:last_after_weight" json:"last_after_weight" form:"last_after_weight"`
 	DisplaceLiquiValue              string  `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	RecordTime                      int64   `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	SymptomAfterDialysisRemark      string  `gorm:"column:symptom_after_dialysis_remark" json:"symptom_after_dialysis_remark" form:"symptom_after_dialysis_remark"`
 }
 
 func (AssessmentAfterDislysis) 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

@@ -390,6 +390,9 @@ type DialysisPrescription struct {
 	DialysisDialyszersId       int64         `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
 	DialysisStrainerId         int64         `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
 	DialysisIrrigationId       int64         `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	FirstSuper                 int64         `gorm:"column:first_super" json:"first_super" form:"first_super"`
+	IsSequential               int64         `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
+	Conduct                    string        `gorm:"column:conduct" json:"conduct" form:"conduct"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -633,6 +636,9 @@ type DialysisSolution struct {
 	DialysisDialyszersId       int64   `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
 	DialysisStrainerId         int64   `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
 	DialysisIrrigationId       int64   `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	FirstSuper                 int64   `gorm:"column:first_super" json:"first_super" form:"first_super"`
+	IsSequential               int64   `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
+	Conduct                    string  `gorm:"column:conduct" json:"conduct" form:"conduct"`
 }
 
 func (DialysisSolution) TableName() string {
@@ -2830,3 +2836,47 @@ 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"
+}
+
+type XtDeathRecord 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"`
+	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"`
+}
+
+func (XtDeathRecord) TableName() string {
+
+	return "xt_death_record"
+}

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
@@ -1854,6 +1872,11 @@ func GetCheckTeamProject(team_id int64, patient_id int64, record_date int64, use
 	return
 }
 
+func GetCheckTeamProjectOne(team_id int64, patient_id int64, record_date int64, user_org_id int64) (ps []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Joins("JOIN xt_his_project as p On p.id = his_prescription_project.project_id").Where("his_prescription_project.team_id IN (?) AND his_prescription_project.patient_id = ? AND his_prescription_project.user_org_id = ? AND his_prescription_project.record_date = ? AND his_prescription_project.status = 1", team_id, patient_id, user_org_id, record_date).Find(&ps).Error
+	return
+}
+
 func GetAdminUserRoleInformation(orgid int64) (models.SgjOrgFollow, error) {
 
 	follow := models.SgjOrgFollow{}

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
@@ -4392,3 +4397,143 @@ func DeletePatientDeathSummary(id int64) error {
 
 	return err
 }
+
+func CreateNewSickHistoryRecord(history models.XtPatientSickHistory) error {
+
+	err := XTWriteDB().Save(&history).Error
+
+	return err
+}
+
+func GetNewSickHistory(patient_id int64, org_id int64) (sick []*models.XtPatientSickHistory, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and status =1", patient_id, org_id).Order("record_time desc").Find(&sick).Error
+
+	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
+}
+
+func GetPatientDeathRecordList(org_id int64) (models.XtDeathRecord, error) {
+
+	deathRecord := models.XtDeathRecord{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", org_id).Find(&deathRecord).Error
+
+	return deathRecord, err
+}
+
+func CreatePatientDeathRecord(record models.XtDeathRecord) error {
+
+	err := XTWriteDB().Create(&record).Error
+
+	return err
+}
+
+func UpdatePatientDeathRecord(id int64, content string) error {
+
+	err := XTWriteDB().Model(&models.XtDeathRecord{}).Where("id =? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+
+	return err
+}
+
+func GetPatientDeathRecord(user_org_id int64) (models.XtDeathRecord, error) {
+
+	record := models.XtDeathRecord{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&record).Error
+
+	return record, err
+}
+
+func SaveCoureseTemplateTitle(courseTemplate models.XtPatientCourseTemplate) error {
+
+	err := XTWriteDB().Create(&courseTemplate).Error
+
+	return err
+
+}
+
+func GetPatientCourseOfTemplate(user_org_id int64) (list []*models.XtPatientCourseTemplate, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&list).Error
+
+	return list, err
+}
+
+func SaveCourseOfNewTemplate(id int64, content string) (models.XtPatientCourseTemplate, error) {
+
+	template := models.XtPatientCourseTemplate{}
+
+	err := XTWriteDB().Model(&template).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+
+	return template, err
+}
+
+func DeleteCouseTemplate(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtPatientCourseTemplate{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}

service/stock_service.go

@@ -3424,6 +3424,12 @@ func FindStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out model
 
 }
 
+func FindStockOutByIsSysOne(org_id int64, is_sys int, record_time int64, warehousing_out_order string) (out models.WarehouseOut, err error) {
+	err = readDb.Model(&models.WarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ? and warehouse_out_order_number = ?", is_sys, org_id, record_time, warehousing_out_order).First(&out).Error
+	return
+
+}
+
 func FindStockOutByIsSysSix(org_id int64, is_sys int, record_time int64, second_warehouse_id int64) (out models.WarehouseOut, err error) {
 	err = readDb.Model(&models.WarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ? AND second_warehouse_id=?", is_sys, org_id, record_time, second_warehouse_id).First(&out).Error
 	return
@@ -3513,6 +3519,13 @@ func UpdateAutoMaticReduceDetailOne(goodid int64, goodtypeid int64, recordtime i
 	return err
 }
 
+func GetGoodsIsExsit(good_id int64, sys_record_time int64, org_id int64, warehouse_out_id int64) (models.WarehouseOutInfo, error) {
+
+	outInfo := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and is_sys =0 and status = 1 and warehouse_out_id = ?", good_id, sys_record_time, org_id, warehouse_out_id).Find(&outInfo).Error
+	return outInfo, err
+}
+
 func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
 
 	err := writeDb.Create(&info).Error