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

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

@@ -0,0 +1,680 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"github.com/astaxie/beego"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type HisApiController struct {
+	BaseAuthAPIController
+}
+
+func HisManagerApiRegistRouters() {
+
+	beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
+	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
+	beego.Router("/api/hisprescription/config", &HisApiController{}, "get:GetHisPrescriptionConfig")
+
+	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
+	beego.Router("/api/hisdoctoradvice/create", &HisApiController{}, "post:CreateHisDoctorAdvice")
+	//beego.Router("/api/hisproject/create", &HisApiController{}, "post:CreateHisProject")
+	//beego.Router("/api/hisorder/create", &HisApiController{}, "post:CreateHisOrder")
+	//beego.Router("/api/hisadditional/create", &HisApiController{}, "post:CreateHisAdditionalCharge")
+
+	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
+	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
+	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "post:CreateHisPatientCaseHistory")
+	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "post:CreateCaseHistoryTemplate")
+	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
+	beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
+
+}
+
+func (c *HisApiController) GetHisPatientList() {
+	types, _ := c.GetInt64("type", 0)
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	if types == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patients,
+		})
+
+	} else if types == 1 { //未就诊
+		var patientsOne []*service.Schedule
+		for _, item := range patients {
+			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
+				patientsOne = append(patientsOne, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsOne,
+		})
+
+	} else if types == 2 { //已就诊
+		var patientsTwo []*service.Schedule
+		for _, item := range patients {
+			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
+				patientsTwo = append(patientsTwo, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsTwo,
+		})
+	}
+
+}
+func (c *HisApiController) GetHisPatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":     his_patient_info,
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"case_history": case_history,
+	})
+	return
+
+}
+func (c *HisApiController) GetHisPrescriptionConfig() {
+	adminInfo := c.GetAdminUserInfo()
+	//获取医嘱模版
+	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
+	//获取所有基础药
+	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	//获取所有项目
+	projects, _ := service.GetAllProjectList(adminInfo.CurrentOrgId)
+	//获取所有项目组套
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"drugs":            drugs,
+		"advices_template": advices,
+		"projects":         projects,
+	})
+}
+func (c *HisApiController) CreateHisPrescription() {
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	types, _ := c.GetInt64("type")
+	doctor := c.GetAdminUserInfo().AdminUser.Id
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	prescription := &models.HisPrescription{
+		UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+		RecordDate:   recordDateTime,
+		PatientId:    patient_id,
+		HisPatientId: his_patient_id,
+		Status:       1,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		Type:         types,
+		Doctor:       doctor,
+		Creator:      doctor,
+		Modifier:     doctor,
+	}
+
+	err = service.SaveHisPrescription(prescription)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *HisApiController) CreateHisDoctorAdvice() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	prescription_id, _ := c.GetInt64("prescription_id")
+
+	//patient, _ := c.GetInt64("id", 0)
+	//if patient <= 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	adminUserInfo := c.GetAdminUserInfo()
+
+	//patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patient)
+	//if patientInfo.ID == 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
+
+	group_no, _ := c.GetInt64("group_no")
+	if group_no <= 0 {
+		group_no = 0
+	}
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	if dataBody["advice_type"] == nil || reflect.TypeOf(dataBody["advice_type"]).String() != "float64" {
+		utils.ErrorLog("advice_type")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceType := int64(dataBody["advice_type"].(float64))
+	if adviceType != 1 && adviceType != 2 {
+		utils.ErrorLog("advice_type != 1&&2")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceDate := startTime2
+	if len(adviceDate) == 0 {
+		utils.ErrorLog("len(adviceDate) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	AdviceDate := theTime.Unix()
+	RecordDate := theTime.Unix()
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	startTime, _ := dataBody["start_time"].(string)
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+
+	Remark := ""
+	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
+		remark, _ := dataBody["remark"].(string)
+		Remark = remark
+	}
+
+	var advices []*models.HisGroupAdvice
+	// utils.TraceLog("%+v", dataBody["adviceNames"])
+	if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
+		utils.ErrorLog("adviceNames")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceNames := dataBody["adviceNames"].([]interface{})
+	for _, adviceNameMap := range adviceNames {
+		adviceNameM := adviceNameMap.(map[string]interface{})
+		var advice models.HisGroupAdvice
+		advice.Remark = Remark
+		advice.AdviceType = adviceType
+		advice.StartTime = StartTime
+		advice.AdviceDate = AdviceDate
+		advice.RecordDate = RecordDate
+		advice.Status = 1
+		advice.CreatedTime = time.Now().Unix()
+		advice.UpdatedTime = time.Now().Unix()
+		advice.StopState = 2
+		advice.ExecutionState = 2
+		advice.UserOrgId = adminUserInfo.CurrentOrgId
+		advice.PatientId = patient_id
+		advice.HisPatientId = his_patient_id
+		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
+		advice.PrescriptionId = prescription_id
+
+		//入口
+		errcode := c.setAdviceWithJSON(&advice, adviceNameM)
+		if errcode > 0 {
+			c.ServeFailJSONWithSGJErrorCode(errcode)
+			return
+		}
+
+		if adviceNameM["subdrugs"] != nil && reflect.TypeOf(adviceNameM["subdrugs"]).String() == "[]interface {}" {
+			subdrugs := adviceNameM["subdrugs"].([]interface{})
+			if len(subdrugs) > 0 {
+				for _, subdrug := range subdrugs {
+					var s models.HisGroupAdvice
+					s.Remark = Remark
+					s.AdviceType = adviceType
+					s.StartTime = StartTime
+					s.AdviceDate = AdviceDate
+					s.RecordDate = RecordDate
+					s.Status = 1
+					s.CreatedTime = time.Now().Unix()
+					s.UpdatedTime = time.Now().Unix()
+					s.StopState = 2
+					s.ExecutionState = 2
+					s.HisPatientId = his_patient_id
+					s.UserOrgId = adminUserInfo.CurrentOrgId
+					s.PatientId = patient_id
+					s.AdviceDoctor = adminUserInfo.AdminUser.Id
+
+					errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
+					if errcode > 0 {
+						c.ServeFailJSONWithSGJErrorCode(errcode)
+						return
+					}
+
+					advice.Children = append(advice.Children, &s)
+				}
+			}
+		}
+
+		advices = append(advices, &advice)
+	}
+
+	newAdvices, createErr := service.CreateHisGroupAdvice(adminUserInfo.CurrentOrgId, advices, group_no)
+	if createErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
+		return
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":     "ok",
+		"advices": newAdvices,
+	})
+	return
+
+}
+
+func (c *HisApiController) CreateHisAdditionalCharge() {
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := c.GetAdminUserInfo()
+	recordDateTime := theTime.Unix()
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	var additions []*models.HisAdditionalCharge
+	if dataBody["addition"] != nil && reflect.TypeOf(dataBody["addition"]).String() == "[]interface {}" {
+		additions, _ := dataBody["addition"].([]interface{})
+		if len(additions) > 0 {
+			for _, item := range additions {
+				items := item.(map[string]interface{})
+
+				if items["item_id"] == nil || reflect.TypeOf(items["item_id"]).String() != "float64" {
+					utils.ErrorLog("item_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				item_id := int64(items["item_id"].(float64))
+
+				if items["item_name"] == nil || reflect.TypeOf(items["item_name"]).String() != "string" {
+					utils.ErrorLog("item_name")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				item_name := items["item_name"].(string)
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+
+				ctime := time.Now().Unix()
+				additional := &models.HisAdditionalCharge{
+					PatientId:    patient_id,
+					HisPatientId: his_patient_id,
+					UserOrgId:    adminInfo.CurrentOrgId,
+					RecordDate:   recordDateTime,
+					CreatedTime:  ctime,
+					UpdatedTime:  ctime,
+					Modifier:     adminInfo.AdminUser.Id,
+					Creator:      adminInfo.AdminUser.Id,
+					Price:        price,
+					ItemName:     item_name,
+					ItemId:       item_id,
+					Status:       1,
+				}
+				additions = append(additions, additional)
+			}
+		}
+	}
+	for _, item := range additions {
+		service.CreateAddtionalCharge(item)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "创建成功",
+	})
+}
+
+func (c *HisApiController) CreateHisPatientCaseHistory() {
+	diagnostic := c.GetString("diagnostic")
+	temperature, _ := c.GetFloat("temperature")
+	blood_sugar, _ := c.GetFloat("blood_sugar")
+	pulse, _ := c.GetFloat("pulse")
+	sbp, _ := c.GetFloat("sbp")
+	dbp, _ := c.GetFloat("dbp")
+	blood_fat, _ := c.GetFloat("blood_fat")
+	height, _ := c.GetFloat("height")
+	sick_type, _ := c.GetInt64("sick_type")
+	symptom := c.GetString("symptom")
+	sick_date := c.GetString("sick_date")
+	is_infect, _ := c.GetInt64("is_infect")
+	chief_conplaint := c.GetString("chief_conplaint")
+	history_of_present_illness := c.GetString("history_of_present_illness")
+	past_history := c.GetString("past_history")
+	personal_history := c.GetString("personal_history")
+	family_history := c.GetString("family_history")
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	sickTime, err := time.ParseInLocation(timeLayout+" 15:04:05", sick_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	sickTimes := sickTime.Unix()
+	ctime := time.Now().Unix()
+	caseHistory := models.HisPatientCaseHistory{
+		HisPatientId:            patient_id,
+		Temperature:             temperature,
+		BloodSugar:              blood_sugar,
+		Pulse:                   pulse,
+		Sbp:                     sbp,
+		Dbp:                     dbp,
+		Height:                  height,
+		BloodFat:                blood_fat,
+		SickType:                sick_type,
+		Symptom:                 symptom,
+		SickDate:                sickTimes,
+		IsInfect:                is_infect,
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		Doctor:                  c.GetAdminUserInfo().AdminUser.Id,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		Status:                  1,
+		Ctime:                   ctime,
+		Mtime:                   ctime,
+		RecordDate:              recordDateTime,
+	}
+	err = service.SaveHisPatientCaseHistory(caseHistory)
+	if err != nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+	}
+}
+func (c *HisApiController) GetHisPatientCaseHistoryList() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	adminUser := c.GetAdminUserInfo()
+	caseHistorys, _ := service.GetHisPatientCaseHistoryList(adminUser.CurrentOrgId, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": caseHistorys,
+	})
+
+}
+func (c *HisApiController) GetHisPatientCaseHistory() {
+	record_date, _ := c.GetInt64("record_date", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	admin := c.GetAdminUserInfo()
+	info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, record_date)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, record_date)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":         info,
+		"case_history": case_history,
+	})
+
+}
+func (c *HisApiController) CreateCaseHistoryTemplate() {
+	template_name := c.GetString("template_name")
+	template_remark := c.GetString("template_remark")
+	doctor := c.GetAdminUserInfo().AdminUser.Id
+	diagnostic := c.GetString("diagnostic")
+	chief_conplaint := c.GetString("chief_conplaint")
+	history_of_present_illness := c.GetString("history_of_present_illness")
+	past_history := c.GetString("past_history")
+	personal_history := c.GetString("personal_history")
+	family_history := c.GetString("family_history")
+	record_date := c.GetString("record_date")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	ctime := time.Now().Unix()
+
+	template := models.HisCaseHistoryTemplate{
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		Status:                  1,
+		Ctime:                   ctime,
+		Mtime:                   ctime,
+		RecordDate:              recordDateTime,
+		TemplateName:            template_name,
+		TemplateRemark:          template_remark,
+		Creator:                 doctor,
+		Modifier:                doctor,
+	}
+
+	err = service.SaveHisPatientCaseHistoryTemplate(template)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+func (c *HisApiController) GetCaseHistoryTemplate() {
+	admin := c.GetAdminUserInfo()
+	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+
+}
+func (c *HisApiController) GetPrintHisPatientCaseHistory() {
+
+}
+func (c *HisApiController) setAdviceWithJSON(advice *models.HisGroupAdvice, json map[string]interface{}) int {
+
+	if json["advice_name"] == nil || reflect.TypeOf(json["advice_name"]).String() != "string" {
+		utils.ErrorLog("advice_name")
+		return enums.ErrorCodeParamWrong
+	}
+	adviceName, _ := json["advice_name"].(string)
+	if len(adviceName) == 0 {
+		utils.ErrorLog("len(advice_name) == 0")
+		return enums.ErrorCodeParamWrong
+	}
+	advice.AdviceName = adviceName
+
+	adviceDesc, _ := json["advice_desc"].(string)
+	advice.AdviceDesc = adviceDesc
+
+	if json["drug_spec"] != nil && reflect.TypeOf(json["drug_spec"]).String() == "string" {
+		drugSpec, _ := strconv.ParseFloat(json["drug_spec"].(string), 64)
+		advice.DrugSpec = drugSpec
+	}
+
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		advice.Remark = remark
+	}
+
+	//if json["src_type"] != nil || reflect.TypeOf(json["src_type"]).String() == "float64" {
+	//	src_type, _ := strconv.ParseInt(json["src_type"].(string),10)
+	//	advice.Way = src_type
+	//}
+	if json["way"] == nil {
+		advice.Way = 0
+
+	} else {
+		if json["way"] != nil || reflect.TypeOf(json["way"]).String() == "float64" {
+			way := int64(json["way"].(float64))
+			advice.Way = way
+		}
+
+	}
+
+	if json["drug_id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if json["drug_id"] != nil || reflect.TypeOf(json["drug_id"]).String() == "float64" {
+			drug_id := int64(json["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+	}
+
+	if json["drug_name_id"] == nil {
+		advice.DrugNameId = 0
+	} else {
+		if json["drug_name_id"] != nil || reflect.TypeOf(json["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(json["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+		}
+	}
+
+	if json["drug_spec_unit"] != nil && reflect.TypeOf(json["drug_spec_unit"]).String() == "string" {
+		drugSpecUnit, _ := json["drug_spec_unit"].(string)
+		advice.DrugSpecUnit = drugSpecUnit
+	}
+
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+
+	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+
+	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
+		advice.PrescribingNumberUnit = prescribingNumberUnit
+	}
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+	return 0
+}

controllers/manager_center_api_controller.go

@@ -1389,7 +1389,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId)
+	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId, good_id)
 	if totals > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -4,15 +4,15 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"github.com/astaxie/beego"
-	"net/http"
-	"net/url"
-	"strconv"
 	_ "XT_New/utils"
 	_ "encoding/json"
 	"fmt"
+	"github.com/astaxie/beego"
 	_ "github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"net/http"
+	"net/url"
+	"strconv"
 	_ "strings"
 
 	// "fmt"
@@ -67,106 +67,106 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 	if dialysistype == 1 {
 		// 保存透前相关数据
 		// 获取透析处方
-		dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-		if getDialysisPrescribeErr != nil {
-			c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		// 获取透析模版
-		dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
-		if getDialysisSolutionErr != nil {
-			c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		//dialysisPrescribe, getDialysisPrescribeErr := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+		//if getDialysisPrescribeErr != nil {
+		//	c.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//
+		//// 获取透析模版
+		//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminUserInfo.Org.Id, id)
+		//if getDialysisSolutionErr != nil {
+		//	c.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
 
 		// 插入透析处方
-		if dialysisPrescribe == nil && dialysisSolution != nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = dialysisSolution.UserOrgId
-			newprescribe.PatientId = dialysisSolution.PatientId
-			newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
-			newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
-			newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
-			newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
-			newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
-			newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
-			newprescribe.ModeId = dialysisSolution.ModeId
-			newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
-			newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
-			newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
-			newprescribe.BloodFilter = dialysisSolution.BloodFilter
-			newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
-			newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
-			newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
-			newprescribe.Glucose = dialysisSolution.Glucose
-			newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
-			newprescribe.Kalium = dialysisSolution.Kalium
-			newprescribe.Sodium = dialysisSolution.Sodium
-			newprescribe.Calcium = dialysisSolution.Calcium
-			newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
-			newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
-			newprescribe.Conductivity = dialysisSolution.Conductivity
-			newprescribe.BodyFluid = dialysisSolution.BodyFluid
-			newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
-			newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
-			newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
-			newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
-			newprescribe.BloodAccess = dialysisSolution.BloodAccess
-			newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
-			newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
-			newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
-			newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
-			newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
-			newprescribe.Dialyzer = dialysisSolution.Dialyzer
-			newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
-			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
-			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
-			newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe == nil && dialysisSolution == nil {
-			var newprescribe models.DialysisPrescription
-			newprescribe.UserOrgId = adminUserInfo.Org.Id
-			newprescribe.PatientId = id
-			newprescribe.CreatedTime = time.Now().Unix()
-			newprescribe.UpdatedTime = time.Now().Unix()
-			newprescribe.RecordDate = theAssessmentDateTime
-			// newprescribe.DewaterAmount = dewater_amount
-			// newprescribe.TargetUltrafiltration = dewater_amount
-			newprescribe.Status = 1
-
-			err := service.AddSigleRecord(&newprescribe)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
-
-		if dialysisPrescribe != nil {
-			dialysisPrescribe.UpdatedTime = time.Now().Unix()
-			dialysisPrescribe.RecordDate = theAssessmentDateTime
-			// dialysisPrescribe.DewaterAmount = dewater_amount
-			// dialysisPrescribe.TargetUltrafiltration = dewater_amount
-			dialysisPrescribe.Status = 1
-			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-			if updateErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
+		//if dialysisPrescribe == nil && dialysisSolution != nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = dialysisSolution.UserOrgId
+		//	newprescribe.PatientId = dialysisSolution.PatientId
+		//	newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
+		//	newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
+		//	newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
+		//	newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
+		//	newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
+		//	newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
+		//	newprescribe.ModeId = dialysisSolution.ModeId
+		//	newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
+		//	newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
+		//	newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
+		//	newprescribe.BloodFilter = dialysisSolution.BloodFilter
+		//	newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
+		//	newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
+		//	newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
+		//	newprescribe.Glucose = dialysisSolution.Glucose
+		//	newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
+		//	newprescribe.Kalium = dialysisSolution.Kalium
+		//	newprescribe.Sodium = dialysisSolution.Sodium
+		//	newprescribe.Calcium = dialysisSolution.Calcium
+		//	newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
+		//	newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
+		//	newprescribe.Conductivity = dialysisSolution.Conductivity
+		//	newprescribe.BodyFluid = dialysisSolution.BodyFluid
+		//	newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
+		//	newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
+		//	newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
+		//	newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
+		//	newprescribe.BloodAccess = dialysisSolution.BloodAccess
+		//	newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
+		//	newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
+		//	newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
+		//	newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
+		//	newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
+		//	newprescribe.Dialyzer = dialysisSolution.Dialyzer
+		//	newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
+		//	newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
+		//	newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
+		//	newprescribe.TargetKtv = dialysisSolution.TargetKtv
+		//
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe == nil && dialysisSolution == nil {
+		//	var newprescribe models.DialysisPrescription
+		//	newprescribe.UserOrgId = adminUserInfo.Org.Id
+		//	newprescribe.PatientId = id
+		//	newprescribe.CreatedTime = time.Now().Unix()
+		//	newprescribe.UpdatedTime = time.Now().Unix()
+		//	newprescribe.RecordDate = theAssessmentDateTime
+		//	// newprescribe.DewaterAmount = dewater_amount
+		//	// newprescribe.TargetUltrafiltration = dewater_amount
+		//	newprescribe.Status = 1
+		//
+		//	err := service.AddSigleRecord(&newprescribe)
+		//	if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
+
+		//if dialysisPrescribe != nil {
+		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
+		//	// dialysisPrescribe.DewaterAmount = dewater_amount
+		//	// dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		//	dialysisPrescribe.Status = 1
+		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		//	if updateErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
@@ -692,7 +692,6 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 	}
 }
-
 func (c *CheckWeightApiController) GetPatientList() {
 	syncTime, _ := c.GetInt64("synctime", 0)
 	force, _ := c.GetInt64("force", 0)
@@ -710,7 +709,6 @@ func (c *CheckWeightApiController) GetPatientList() {
 		"servicetime": serviceTime,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)
 	if patientId <= 0 {
@@ -729,7 +727,6 @@ func (c *CheckWeightApiController) GetPatientListById() {
 		"patientinfo": patient,
 	})
 }
-
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {
@@ -797,7 +794,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 
 		// 排队叫号的签到
 		ssoDomain := beego.AppConfig.String("call_domain")
-		api := ssoDomain + "/index/patientsign/"+strconv.FormatInt(adminUserInfo.Org.Id, 10)+"/"+strconv.FormatInt(id, 10)
+		api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
 		values := make(url.Values)
 
 		http.PostForm(api, values)
@@ -964,8 +961,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 	}
 
-
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dialysistype":     dialysistype,
 		"patient":          dialysisinfo,
@@ -975,7 +970,6 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	})
 	return
 }
-
 func (c *CheckWeightApiController) GetPatientInfoBeforeDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2350,25 +2350,25 @@ func (c *DialysisAPIController) GetLongAdvice() {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
 				week := int(t.Weekday())
+				fmt.Println(t.Weekday())
+
+				fmt.Println(week)
 
 				switch week {
 				case 1:
 					if strings.Index(advice.WeekDay, "周一") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 2:
 					if strings.Index(advice.WeekDay, "周二") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 3:
 					if strings.Index(advice.WeekDay, "周三") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 4:
 					if strings.Index(advice.WeekDay, "周四") == -1 {
@@ -2384,7 +2384,6 @@ func (c *DialysisAPIController) GetLongAdvice() {
 					if strings.Index(advice.WeekDay, "周六") == -1 {
 						advice_three = append(advice_three, advice)
 					}
-
 					break
 				case 0:
 					if strings.Index(advice.WeekDay, "周日") == -1 {
@@ -3581,17 +3580,13 @@ func (c *DialysisAPIController) EditConsumables() {
 					for _, before := range beforePrepares {
 
 						if consumable.GoodId == before.GoodId {
-							fmt.Println(consumable.Count)
-							fmt.Println(before.Count)
 
 							if consumable.Count != before.Count {
-								fmt.Println("111111111")
 								_, out := service.FindStockOutOrderNumberByTime(record_time, adminInfo.Org.Id)
 								//_, out := service.FindOldOrderInfoByGoodId(record_time, adminInfo.Org.Id)
 								//判断前端更改后的商品id的出库记录在数据库中是否存在
 								err, newOut := service.FindOrderInfoByGoodId(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id)
 								if err == gorm.ErrRecordNotFound { //不存在，则新增出库记录，并更改使用人商品信息
-									fmt.Println("222222222")
 
 									warehouseOutInfo := &models.WarehouseOutInfo{
 										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
@@ -3614,7 +3609,7 @@ func (c *DialysisAPIController) EditConsumables() {
 									err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 									if err == nil {
 										//可能存在商品使用人不存在的情况，需要先判断商品使用人是否存在
-										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(before.GoodTypeId, before.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          warehouseOutInfo.ID,
@@ -3655,7 +3650,7 @@ func (c *DialysisAPIController) EditConsumables() {
 										} else if consumable.Count < before.Count { //增加
 											service.UpdateOrderCountAdd(consumable.GoodTypeId, consumable.GoodId, out.WarehouseOutOrderNumber, adminInfo.Org.Id, before.Count-consumable.Count)
 										}
-										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, out.WarehouseOutOrderNumber)
+										user, err := service.FindGoodUserById(consumable.GoodTypeId, consumable.GoodId, patient_id, adminInfo.Org.Id, record_time)
 										if err == gorm.ErrRecordNotFound {
 											details := &models.AutomaticReduceDetail{
 												WarehouseOutId:          newOut.ID,
@@ -4267,3 +4262,20 @@ func (c *DialysisAPIController) GetAllDrug() {
 	})
 
 }
+
+func RemoveRepeatedGoodTwo(arr []*models.DialysisBeforePrepare) (newArr []*models.DialysisBeforePrepare) {
+	newArr = make([]*models.DialysisBeforePrepare, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].GoodId == arr[j].GoodId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2790,7 +2790,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
-	fmt.Println("is_child------------------------------", is_child)
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {

controllers/schedule_api_controller.go

@@ -689,8 +689,10 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		for index := weekStart1; index <= weekEnd1; index++ {
 			theDay := thisTime1.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
-			if index == 0 {
+
+			if index == -1 {
 				start_time = theDay.Format("2006-01-02")
+				fmt.Println(start_time)
 			}
 
 			end_time = theDay.Format("2006-01-02")
@@ -729,7 +731,7 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		for index := weekStart2; index <= weekEnd2; index++ {
 			theDay := thisTime2.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
-			if index == 0 {
+			if index == -1 {
 				start_time = theDay.Format("2006-01-02")
 			}
 
@@ -1277,6 +1279,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 				date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 				sch.ScheduleDate = date.Unix()
 			}
+
 			sch.CreatedTime = time.Now().Unix()
 			sch.UpdatedTime = time.Now().Unix()
 			sch.ModeId = 1

routers/router.go

@@ -53,6 +53,7 @@ func init() {
 	controllers.PCIndexEvaluationApiControllersRegisterRouters()
 	controllers.ManagerCenterRegistRouters()
 	controllers.DrugStockManagerApiRegistRouters()
+	controllers.HisManagerApiRegistRouters()
 
 	m_api.MobileAPIControllersRegisterRouters()
 	new_m_api.NewMobileAPIControllersRegisterRouters()

service/dialysis_service.go

@@ -171,7 +171,6 @@ func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err err
 	return
 }
 
-
 //修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
@@ -981,8 +980,8 @@ func FindOrderInfoByGoodId(good_type_id int64, good_id int64, number string, org
 	return
 }
 
-func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, number string) (user models.AutomaticReduceDetail, err error) {
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND warehouse_out_order_number = ? ", good_id, good_type_id, id, org_id, number).First(&user).Error
+func FindGoodUserById(good_type_id int64, good_id int64, id int64, org_id int64, record_time int64) (user models.AutomaticReduceDetail, err error) {
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND patient_id = ? AND org_id = ? AND record_time = ? ", good_id, good_type_id, id, org_id, record_time).First(&user).Error
 	return
 }
 

service/patient_service.go

@@ -1369,3 +1369,39 @@ func FindDoctorAdviceByIdsTwo(orgID int64, ids []string) (advice []models.Doctor
 	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? AND status = 1 AND execution_state = 2 AND (id IN (?) OR parent_id IN (?))", orgID, ids, ids).Find(&advice).Error
 	return
 }
+
+func CreateHisGroupAdvice(orgId int64, advices []*models.HisGroupAdvice, groupNo int64) (list []*models.HisGroupAdvice, err error) {
+	if groupNo <= 0 {
+		group := GetMaxAdviceGroupID(orgId)
+		groupNo = group + 1
+	}
+	tx := writeDb.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	for _, advice := range advices {
+		advice.Groupno = groupNo
+		if err = tx.Create(advice).Error; err != nil {
+			tx.Rollback()
+			return
+		}
+		list = append(list, advice)
+		if len(advice.Children) > 0 {
+			for _, child := range advice.Children {
+				child.Groupno = groupNo
+				child.ParentId = advice.ID
+				fmt.Println(child)
+				if err = tx.Create(&child).Error; err != nil {
+					tx.Rollback()
+					return
+				}
+				list = append(list, child)
+			}
+		}
+
+	}
+	tx.Commit()
+	return
+}

service/schedule_service.go

@@ -13,7 +13,7 @@ import (
 //GetSchedulePartitionPanel 取出排班面板，分区-机号
 func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err error) {
 
-	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
+	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Order("").Find(&partitions).Error
 
 	return
 }

service/stock_service.go

@@ -1874,8 +1874,8 @@ func FindGoodTypeByName(name string, org_id int64) (total int64) {
 	readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1 AND type_name = ? ", org_id, name).Count(&total)
 	return
 }
-func FindGoodInfoByName(name string, org_id int64) (total int64) {
-	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? ", org_id, name).Count(&total)
+func FindGoodInfoByName(name string, org_id int64, good_type_id int64) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? ", org_id, name, good_type_id).Count(&total)
 	return
 }