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

@@ -195,6 +195,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 
 	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
 
+	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
+
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -206,13 +208,15 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		"department":       department,
 		"sick":             sick,
 		"additions":        additions,
+		"diagnose":         diagnose,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
-	reg_type := c.GetString("reg_type")
-	diagnose := c.GetString("diagnose")
+	reg_type, _ := c.GetInt64("reg_type")
+	diagnose, _ := c.GetInt64("diagnose")
+	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
 	department, _ := c.GetInt64("department", 0)
@@ -264,6 +268,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			PrescriptionStatus: 1,
 			Doctor:             role.UserName,
 			DoctorId:           doctor_id,
+			SickType:           sick_type,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 
@@ -286,6 +291,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			Doctor:             role.UserName,
 			PrescriptionStatus: info.PrescriptionStatus,
 			DoctorId:           doctor_id,
+			SickType:           sick_type,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 	}
@@ -1396,10 +1402,13 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
 			err := service.CreateHisPatientTwo(&his)
+
+			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
+
 			if err == nil {
 				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-					"&diag=" + patientPrescription.Diagnosis + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
+					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/manager_center_api_controller.go

@@ -72,6 +72,13 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/addition/delete", &ManagerCenterApiController{}, "post:DeleteAddition")
 	beego.Router("/api/addition/get", &ManagerCenterApiController{}, "get:GetAddition")
 
+	//门诊诊断
+	beego.Router("/api/diagnose/create", &ManagerCenterApiController{}, "post:CreateDiagnose")
+	beego.Router("/api/diagnose/modify", &ManagerCenterApiController{}, "post:ModifyDiagnose")
+	beego.Router("/api/diagnose/list", &ManagerCenterApiController{}, "get:GetDiagnoseList")
+	beego.Router("/api/diagnose/delete", &ManagerCenterApiController{}, "post:DeleteDiagnose")
+	beego.Router("/api/diagnose/get", &ManagerCenterApiController{}, "get:GetDiagnose")
+
 }
 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
@@ -1928,3 +1935,145 @@ func (c *ManagerCenterApiController) GetAddition() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) CreateDiagnose() {
+	class_name := c.GetString("class_name")
+	content_code := c.GetString("content_code")
+	country_code := c.GetString("country_code")
+	country_content_name := c.GetString("country_content_name")
+	remark := c.GetString("remark")
+	pinyin := c.GetString("pinyin")
+	wubi := c.GetString("wubi")
+
+	if len(class_name) <= 0 {
+		utils.ErrorLog("len(class_name) == 0")
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(content_code) <= 0 {
+		utils.ErrorLog("len(content_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	dealer := models.HisXtDiagnoseConfig{
+		ClassName:          class_name,
+		ContentCode:        content_code,
+		CountryCode:        country_code,
+		CountryContentName: country_content_name,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Remark:             remark,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		Status:             1,
+		Pinyin:             pinyin,
+		Wubi:               wubi,
+	}
+
+	err, dealers := service.AddSigleDiagnose(&dealer)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": dealers,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+
+	}
+
+}
+func (c *ManagerCenterApiController) ModifyDiagnose() {
+	id, _ := c.GetInt64("id", 0)
+
+	class_name := c.GetString("class_name")
+	content_code := c.GetString("content_code")
+	country_code := c.GetString("country_code")
+	country_content_name := c.GetString("country_content_name")
+	remark := c.GetString("remark")
+	pinyin := c.GetString("pinyin")
+	wubi := c.GetString("wubi")
+
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(class_name) <= 0 {
+		utils.ErrorLog("len(class_name) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(content_code) <= 0 {
+		utils.ErrorLog("len(content_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	dealer := models.HisXtDiagnoseConfig{
+		ID:                 id,
+		ClassName:          class_name,
+		ContentCode:        content_code,
+		CountryCode:        country_code,
+		CountryContentName: country_content_name,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Remark:             remark,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		Pinyin:             pinyin,
+		Wubi:               wubi,
+		Status:             1,
+	}
+
+	err := service.ModifyDiagnose(&dealer)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": dealer,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) GetDiagnoseList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 7)
+	adminUserInfo := c.GetAdminUserInfo()
+	mzSick, total, err := service.FindAllDiagnoseList(adminUserInfo.CurrentOrgId, page, limit)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick":  mzSick,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) DeleteDiagnose() {
+	id, _ := c.GetInt64("id", 0)
+	err := service.DeleteDiagnoseById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) GetDiagnose() {
+	id, _ := c.GetInt64("id", 0)
+	mzSick, err := service.FindDiagnoseById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": mzSick,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

models/his_models.go

@@ -83,13 +83,14 @@ type HisPatient struct {
 	Name                   string  `gorm:"column:name" json:"name" form:"name"`
 	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
 	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
 	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Age                    float64 `gorm:"column:age" json:"age" form:"age"`
+	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
 	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
-	IdNumber               string  `gorm:"column:id_number" json:"id_number" form:"id_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
 	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
 	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
@@ -102,6 +103,20 @@ type HisPatient struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	PsnNo                  string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType            string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                 string  `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName                string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                   string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                   string  `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                   string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 }
 
 func (HisPatient) TableName() string {
@@ -261,8 +276,8 @@ type HisPrescriptionInfo struct {
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       string          `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
@@ -271,6 +286,7 @@ type HisPrescriptionInfo struct {
 	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
+	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -296,9 +312,9 @@ type HisPrescription struct {
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 }
 
 func (HisPrescription) TableName() string {
@@ -853,3 +869,22 @@ type XtHisMedicalTemplate struct {
 func (XtHisMedicalTemplate) TableName() string {
 	return "xt_his_medical_template"
 }
+
+type HisXtDiagnoseConfig struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	ClassName          string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	Pinyin             string `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi               string `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	ContentCode        string `gorm:"column:content_code" json:"content_code" form:"content_code"`
+	CountryCode        string `gorm:"column:country_code" json:"country_code" form:"country_code"`
+	CountryContentName string `gorm:"column:country_content_name" json:"country_content_name" form:"country_content_name"`
+	Remark             string `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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 (HisXtDiagnoseConfig) TableName() string {
+	return "his_xt_diagnose_config"
+}

service/his_service.go

@@ -50,8 +50,8 @@ type VMHisPrescriptionInfo struct {
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Diagnosis          int64  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
@@ -60,6 +60,7 @@ type VMHisPrescriptionInfo struct {
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (VMHisPrescriptionInfo) TableName() string {
@@ -103,7 +104,7 @@ func GetAllBaseDrugStockList(org_id int64) (drugs []*models.BaseDrugLib, err err
 	return
 }
 
-func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info HisPatient, err error) {
+func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPatient, err error) {
 	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
 	return
 }
@@ -514,8 +515,8 @@ type HisPrescriptionInfo struct {
 	Mtime                 int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis             string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType          string                       `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Diagnosis             int64                        `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType          int64                        `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory           string                       `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
@@ -527,6 +528,7 @@ type HisPrescriptionInfo struct {
 	PrescriptionStatus    int64                        `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	DoctorId              int64                        `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	DepartmentId          int64                        `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	SickType              int64                        `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -626,6 +628,13 @@ func FindAllSick(orgId int64) (list []*models.OutpatientServiceSick, err error)
 
 }
 
+func FindAllDiagnose(orgId int64) (list []*models.HisXtDiagnoseConfig, err error) {
+	db := readDb.Model(&models.HisXtDiagnoseConfig{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Order("ctime desc").Find(&list).Error
+	return
+}
+
 func FindAllAddition(orgId int64) (list []*models.XtHisAddtionConfig, err error) {
 	db := readDb.Model(&models.XtHisAddtionConfig{})
 	db = db.Where("user_org_id = ? AND status = 1", orgId)

service/manage_center_service.go

@@ -315,3 +315,33 @@ func FindAdditionById(id int64) (*models.XtHisAddtionConfig, error) {
 	err := readDb.Model(&models.XtHisAddtionConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
 	return dealer, err
 }
+
+func AddSigleDiagnose(dealer *models.HisXtDiagnoseConfig) (error, *models.HisXtDiagnoseConfig) {
+	err := writeDb.Create(&dealer).Error
+	return err, dealer
+}
+
+func ModifyDiagnose(mesick *models.HisXtDiagnoseConfig) error {
+	err := writeDb.Save(&mesick).Error
+
+	return err
+}
+
+func FindAllDiagnoseList(orgId int64, page int64, limit int64) (list []*models.HisXtDiagnoseConfig, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisXtDiagnoseConfig{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	return
+}
+
+func DeleteDiagnoseById(id int64) error {
+	err := writeDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return err
+}
+
+func FindDiagnoseById(id int64) (*models.HisXtDiagnoseConfig, error) {
+	dealer := &models.HisXtDiagnoseConfig{}
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
+	return dealer, err
+}