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

controllers/his_api_controller.go

@@ -116,6 +116,11 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+
+	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
 	//获取所有项目
 	projects, _ := service.GetAllProjectList(adminInfo.CurrentOrgId)
 	//获取所有项目组套
@@ -124,73 +129,17 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		"drugs":            drugs,
 		"advices_template": advices,
 		"projects":         projects,
+		"drugways":         drugways,
+		"efs":              efs,
 	})
 }
 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
-	//}
+	doctor, _ := c.GetInt64("doctor")
 
-	group_no, _ := c.GetInt64("group_no")
-	if group_no <= 0 {
-		group_no = 0
-	}
+	diagnose := c.GetString("diagnose")
+	special_sick_history := c.GetString("special_sick_history")
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -202,155 +151,76 @@ func (c *HisApiController) CreateHisDoctorAdvice() {
 
 	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)
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	if err != nil {
-		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	AdviceDate := theTime.Unix()
-	RecordDate := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	recordDateTime := 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()
+	//types, _ := c.GetInt64("type")
+	var prescriptions []*models.HisPrescription
 
-	Remark := ""
-	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
-		remark, _ := dataBody["remark"].(string)
-		Remark = remark
-	}
+	if dataBody["prescription"] != nil && reflect.TypeOf(dataBody["prescription"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["prescription"].([]interface{})
+		if len(prescriptions) > 0 {
+			for _, item := range prescriptions {
+				items := item.(map[string]interface{})
 
-	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 items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				types := int64(items["type"].(float64))
 
-		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
+				ctime := time.Now().Unix()
+				prescription := &models.HisPrescription{
+					PatientId:  patient_id,
+					UserOrgId:  adminInfo.CurrentOrgId,
+					RecordDate: recordDateTime,
+					Ctime:      ctime,
+					Mtime:      ctime,
+					Type:       types,
+					Modifier:   adminInfo.AdminUser.Id,
+					Creator:    adminInfo.AdminUser.Id,
+					Status:     1,
+					Doctor:     doctor,
+				}
+				//prescriptions = append(prescriptions, prescription)
+				service.SaveHisPrescription(prescription)
+
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var s models.HisDoctorAdviceInfo
+
+							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							advice.Children = append(advice.Children, &s)
+						}
 					}
-
-					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)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":     "ok",
-		"advices": newAdvices,
-	})
-	return
-
 }
 
 func (c *HisApiController) CreateHisAdditionalCharge() {
@@ -584,7 +454,7 @@ func (c *HisApiController) GetCaseHistoryTemplate() {
 func (c *HisApiController) GetPrintHisPatientCaseHistory() {
 
 }
-func (c *HisApiController) setAdviceWithJSON(advice *models.HisGroupAdvice, json map[string]interface{}) int {
+func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]interface{}) int {
 
 	if json["advice_name"] == nil || reflect.TypeOf(json["advice_name"]).String() != "string" {
 		utils.ErrorLog("advice_name")
@@ -610,10 +480,6 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisGroupAdvice, json
 		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
 

controllers/his_project_api_controller.go

@@ -5,7 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
+	//"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"