Browse Source

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

XMLWAN 4 years ago
parent
commit
aed6136c7c

+ 12 - 3
controllers/his_api_controller.go View File

195
 
195
 
196
 	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
196
 	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
197
 
197
 
198
+	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
199
+
198
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
200
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
199
 
201
 
200
 	c.ServeSuccessJSON(map[string]interface{}{
202
 	c.ServeSuccessJSON(map[string]interface{}{
206
 		"department":       department,
208
 		"department":       department,
207
 		"sick":             sick,
209
 		"sick":             sick,
208
 		"additions":        additions,
210
 		"additions":        additions,
211
+		"diagnose":         diagnose,
209
 	})
212
 	})
210
 }
213
 }
211
 func (c *HisApiController) CreateHisPrescription() {
214
 func (c *HisApiController) CreateHisPrescription() {
212
 	record_date := c.GetString("record_date")
215
 	record_date := c.GetString("record_date")
213
 	patient_id, _ := c.GetInt64("patient_id")
216
 	patient_id, _ := c.GetInt64("patient_id")
214
-	reg_type := c.GetString("reg_type")
215
-	diagnose := c.GetString("diagnose")
217
+	reg_type, _ := c.GetInt64("reg_type")
218
+	diagnose, _ := c.GetInt64("diagnose")
219
+	sick_type, _ := c.GetInt64("sick_type")
216
 	sick_history := c.GetString("sick_history")
220
 	sick_history := c.GetString("sick_history")
217
 	doctor_id, _ := c.GetInt64("doctor", 0)
221
 	doctor_id, _ := c.GetInt64("doctor", 0)
218
 	department, _ := c.GetInt64("department", 0)
222
 	department, _ := c.GetInt64("department", 0)
264
 			PrescriptionStatus: 1,
268
 			PrescriptionStatus: 1,
265
 			Doctor:             role.UserName,
269
 			Doctor:             role.UserName,
266
 			DoctorId:           doctor_id,
270
 			DoctorId:           doctor_id,
271
+			SickType:           sick_type,
267
 		}
272
 		}
268
 		service.SavePatientPrescriptionInfo(hpInfo)
273
 		service.SavePatientPrescriptionInfo(hpInfo)
269
 
274
 
286
 			Doctor:             role.UserName,
291
 			Doctor:             role.UserName,
287
 			PrescriptionStatus: info.PrescriptionStatus,
292
 			PrescriptionStatus: info.PrescriptionStatus,
288
 			DoctorId:           doctor_id,
293
 			DoctorId:           doctor_id,
294
+			SickType:           sick_type,
289
 		}
295
 		}
290
 		service.SavePatientPrescriptionInfo(hpInfo)
296
 		service.SavePatientPrescriptionInfo(hpInfo)
291
 	}
297
 	}
1396
 			his.Ctime = time.Now().Unix()
1402
 			his.Ctime = time.Now().Unix()
1397
 			his.Mtime = time.Now().Unix()
1403
 			his.Mtime = time.Now().Unix()
1398
 			err := service.CreateHisPatientTwo(&his)
1404
 			err := service.CreateHisPatientTwo(&his)
1405
+
1406
+			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
1407
+
1399
 			if err == nil {
1408
 			if err == nil {
1400
 				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
1409
 				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
1401
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
1410
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
1402
-					"&diag=" + patientPrescription.Diagnosis + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
1411
+					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
1403
 				resp, requestErr := http.Get(api)
1412
 				resp, requestErr := http.Get(api)
1404
 				if requestErr != nil {
1413
 				if requestErr != nil {
1405
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
1414
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

+ 149 - 0
controllers/manager_center_api_controller.go View File

72
 	beego.Router("/api/addition/delete", &ManagerCenterApiController{}, "post:DeleteAddition")
72
 	beego.Router("/api/addition/delete", &ManagerCenterApiController{}, "post:DeleteAddition")
73
 	beego.Router("/api/addition/get", &ManagerCenterApiController{}, "get:GetAddition")
73
 	beego.Router("/api/addition/get", &ManagerCenterApiController{}, "get:GetAddition")
74
 
74
 
75
+	//门诊诊断
76
+	beego.Router("/api/diagnose/create", &ManagerCenterApiController{}, "post:CreateDiagnose")
77
+	beego.Router("/api/diagnose/modify", &ManagerCenterApiController{}, "post:ModifyDiagnose")
78
+	beego.Router("/api/diagnose/list", &ManagerCenterApiController{}, "get:GetDiagnoseList")
79
+	beego.Router("/api/diagnose/delete", &ManagerCenterApiController{}, "post:DeleteDiagnose")
80
+	beego.Router("/api/diagnose/get", &ManagerCenterApiController{}, "get:GetDiagnose")
81
+
75
 }
82
 }
76
 
83
 
77
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
84
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
1928
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
1935
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
1929
 	}
1936
 	}
1930
 }
1937
 }
1938
+
1939
+func (c *ManagerCenterApiController) CreateDiagnose() {
1940
+	class_name := c.GetString("class_name")
1941
+	content_code := c.GetString("content_code")
1942
+	country_code := c.GetString("country_code")
1943
+	country_content_name := c.GetString("country_content_name")
1944
+	remark := c.GetString("remark")
1945
+	pinyin := c.GetString("pinyin")
1946
+	wubi := c.GetString("wubi")
1947
+
1948
+	if len(class_name) <= 0 {
1949
+		utils.ErrorLog("len(class_name) == 0")
1950
+
1951
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
1952
+		return
1953
+	}
1954
+
1955
+	if len(content_code) <= 0 {
1956
+		utils.ErrorLog("len(content_code) == 0")
1957
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
1958
+		return
1959
+	}
1960
+
1961
+	adminUserInfo := c.GetAdminUserInfo()
1962
+
1963
+	dealer := models.HisXtDiagnoseConfig{
1964
+		ClassName:          class_name,
1965
+		ContentCode:        content_code,
1966
+		CountryCode:        country_code,
1967
+		CountryContentName: country_content_name,
1968
+		Ctime:              time.Now().Unix(),
1969
+		Mtime:              time.Now().Unix(),
1970
+		Remark:             remark,
1971
+		UserOrgId:          adminUserInfo.CurrentOrgId,
1972
+		Status:             1,
1973
+		Pinyin:             pinyin,
1974
+		Wubi:               wubi,
1975
+	}
1976
+
1977
+	err, dealers := service.AddSigleDiagnose(&dealer)
1978
+	if err == nil {
1979
+		c.ServeSuccessJSON(map[string]interface{}{
1980
+			"sick": dealers,
1981
+		})
1982
+
1983
+	} else {
1984
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
1985
+
1986
+	}
1987
+
1988
+}
1989
+func (c *ManagerCenterApiController) ModifyDiagnose() {
1990
+	id, _ := c.GetInt64("id", 0)
1991
+
1992
+	class_name := c.GetString("class_name")
1993
+	content_code := c.GetString("content_code")
1994
+	country_code := c.GetString("country_code")
1995
+	country_content_name := c.GetString("country_content_name")
1996
+	remark := c.GetString("remark")
1997
+	pinyin := c.GetString("pinyin")
1998
+	wubi := c.GetString("wubi")
1999
+
2000
+	if id <= 0 {
2001
+		utils.ErrorLog("id == 0")
2002
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
2003
+		return
2004
+	}
2005
+
2006
+	if len(class_name) <= 0 {
2007
+		utils.ErrorLog("len(class_name) == 0")
2008
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
2009
+		return
2010
+	}
2011
+
2012
+	if len(content_code) <= 0 {
2013
+		utils.ErrorLog("len(content_code) == 0")
2014
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
2015
+		return
2016
+	}
2017
+
2018
+	adminUserInfo := c.GetAdminUserInfo()
2019
+	dealer := models.HisXtDiagnoseConfig{
2020
+		ID:                 id,
2021
+		ClassName:          class_name,
2022
+		ContentCode:        content_code,
2023
+		CountryCode:        country_code,
2024
+		CountryContentName: country_content_name,
2025
+		Ctime:              time.Now().Unix(),
2026
+		Mtime:              time.Now().Unix(),
2027
+		Remark:             remark,
2028
+		UserOrgId:          adminUserInfo.CurrentOrgId,
2029
+		Pinyin:             pinyin,
2030
+		Wubi:               wubi,
2031
+		Status:             1,
2032
+	}
2033
+
2034
+	err := service.ModifyDiagnose(&dealer)
2035
+
2036
+	if err == nil {
2037
+		c.ServeSuccessJSON(map[string]interface{}{
2038
+			"sick": dealer,
2039
+		})
2040
+	} else {
2041
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2042
+	}
2043
+}
2044
+func (c *ManagerCenterApiController) GetDiagnoseList() {
2045
+	page, _ := c.GetInt64("page", 1)
2046
+	limit, _ := c.GetInt64("limit", 7)
2047
+	adminUserInfo := c.GetAdminUserInfo()
2048
+	mzSick, total, err := service.FindAllDiagnoseList(adminUserInfo.CurrentOrgId, page, limit)
2049
+	if err == nil {
2050
+		c.ServeSuccessJSON(map[string]interface{}{
2051
+			"sick":  mzSick,
2052
+			"total": total,
2053
+		})
2054
+	} else {
2055
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2056
+	}
2057
+}
2058
+func (c *ManagerCenterApiController) DeleteDiagnose() {
2059
+	id, _ := c.GetInt64("id", 0)
2060
+	err := service.DeleteDiagnoseById(id)
2061
+	if err == nil {
2062
+		c.ServeSuccessJSON(map[string]interface{}{
2063
+			"msg": "删除成功",
2064
+		})
2065
+	} else {
2066
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2067
+	}
2068
+}
2069
+func (c *ManagerCenterApiController) GetDiagnose() {
2070
+	id, _ := c.GetInt64("id", 0)
2071
+	mzSick, err := service.FindDiagnoseById(id)
2072
+	if err == nil {
2073
+		c.ServeSuccessJSON(map[string]interface{}{
2074
+			"sick": mzSick,
2075
+		})
2076
+	} else {
2077
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2078
+	}
2079
+}

+ 43 - 8
models/his_models.go View File

83
 	Name                   string  `gorm:"column:name" json:"name" form:"name"`
83
 	Name                   string  `gorm:"column:name" json:"name" form:"name"`
84
 	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
84
 	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
85
 	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
85
 	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
86
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
86
 	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
87
 	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
87
 	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
88
 	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
88
-	Age                    float64 `gorm:"column:age" json:"age" form:"age"`
89
+	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
89
 	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
90
 	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
90
-	IdNumber               string  `gorm:"column:id_number" json:"id_number" form:"id_number"`
91
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
91
 	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
92
 	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
92
-	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
93
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
93
 	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
94
 	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
94
 	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
95
 	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
95
 	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
96
 	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
102
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
103
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
103
 	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
104
 	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
104
 	Number                 string  `gorm:"column:number" json:"number" form:"number"`
105
 	Number                 string  `gorm:"column:number" json:"number" form:"number"`
106
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
107
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
108
+	PsnNo                  string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
109
+	PsnCertType            string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
110
+	Certno                 string  `gorm:"column:certno" json:"certno" form:"certno"`
111
+	PsnName                string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
112
+	Gend                   string  `gorm:"column:gend" json:"gend" form:"gend"`
113
+	Naty                   string  `gorm:"column:naty" json:"naty" form:"naty"`
114
+	Brdy                   string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
115
+	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
116
+	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
117
+	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
118
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
119
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
105
 }
120
 }
106
 
121
 
107
 func (HisPatient) TableName() string {
122
 func (HisPatient) TableName() string {
261
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
276
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
262
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
277
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
263
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
278
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
264
-	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
265
-	RegisterType       string          `gorm:"column:register_type" json:"register_type" form:"register_type"`
279
+	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
280
+	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
266
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
281
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
267
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
282
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
268
 	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
283
 	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
271
 	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
286
 	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
272
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
287
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
273
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
288
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
289
+	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
274
 }
290
 }
275
 
291
 
276
 func (HisPrescriptionInfo) TableName() string {
292
 func (HisPrescriptionInfo) TableName() string {
296
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
312
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
297
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
313
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
298
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
314
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
299
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
300
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
301
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
315
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
316
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
317
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
302
 }
318
 }
303
 
319
 
304
 func (HisPrescription) TableName() string {
320
 func (HisPrescription) TableName() string {
853
 func (XtHisMedicalTemplate) TableName() string {
869
 func (XtHisMedicalTemplate) TableName() string {
854
 	return "xt_his_medical_template"
870
 	return "xt_his_medical_template"
855
 }
871
 }
872
+
873
+type HisXtDiagnoseConfig struct {
874
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
875
+	ClassName          string `gorm:"column:class_name" json:"class_name" form:"class_name"`
876
+	Pinyin             string `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
877
+	Wubi               string `gorm:"column:wubi" json:"wubi" form:"wubi"`
878
+	ContentCode        string `gorm:"column:content_code" json:"content_code" form:"content_code"`
879
+	CountryCode        string `gorm:"column:country_code" json:"country_code" form:"country_code"`
880
+	CountryContentName string `gorm:"column:country_content_name" json:"country_content_name" form:"country_content_name"`
881
+	Remark             string `gorm:"column:remark" json:"remark" form:"remark"`
882
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
883
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
884
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
885
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
886
+}
887
+
888
+func (HisXtDiagnoseConfig) TableName() string {
889
+	return "his_xt_diagnose_config"
890
+}

+ 14 - 5
service/his_service.go View File

50
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
50
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
51
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
51
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
52
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
52
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
53
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
54
-	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
53
+	Diagnosis          int64  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
54
+	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
55
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
55
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
56
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
56
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
57
 	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
57
 	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
60
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
60
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
61
 	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
61
 	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
62
 	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
62
 	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
63
+	SickType           int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
63
 }
64
 }
64
 
65
 
65
 func (VMHisPrescriptionInfo) TableName() string {
66
 func (VMHisPrescriptionInfo) TableName() string {
103
 	return
104
 	return
104
 }
105
 }
105
 
106
 
106
-func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info HisPatient, err error) {
107
+func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPatient, err error) {
107
 	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
108
 	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
108
 	return
109
 	return
109
 }
110
 }
514
 	Mtime                 int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
515
 	Mtime                 int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
515
 	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
516
 	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
516
 	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
517
 	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
517
-	Diagnosis             string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
518
-	RegisterType          string                       `gorm:"column:register_type" json:"register_type" form:"register_type"`
518
+	Diagnosis             int64                        `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
519
+	RegisterType          int64                        `gorm:"column:register_type" json:"register_type" form:"register_type"`
519
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
520
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
520
 	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
521
 	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
521
 	SickHistory           string                       `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
522
 	SickHistory           string                       `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
527
 	PrescriptionStatus    int64                        `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
528
 	PrescriptionStatus    int64                        `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
528
 	DoctorId              int64                        `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
529
 	DoctorId              int64                        `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
529
 	DepartmentId          int64                        `gorm:"column:department_id" json:"department_id" form:"department_id"`
530
 	DepartmentId          int64                        `gorm:"column:department_id" json:"department_id" form:"department_id"`
531
+	SickType              int64                        `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
530
 }
532
 }
531
 
533
 
532
 func (HisPrescriptionInfo) TableName() string {
534
 func (HisPrescriptionInfo) TableName() string {
626
 
628
 
627
 }
629
 }
628
 
630
 
631
+func FindAllDiagnose(orgId int64) (list []*models.HisXtDiagnoseConfig, err error) {
632
+	db := readDb.Model(&models.HisXtDiagnoseConfig{})
633
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
634
+	err = db.Order("ctime desc").Find(&list).Error
635
+	return
636
+}
637
+
629
 func FindAllAddition(orgId int64) (list []*models.XtHisAddtionConfig, err error) {
638
 func FindAllAddition(orgId int64) (list []*models.XtHisAddtionConfig, err error) {
630
 	db := readDb.Model(&models.XtHisAddtionConfig{})
639
 	db := readDb.Model(&models.XtHisAddtionConfig{})
631
 	db = db.Where("user_org_id = ? AND status = 1", orgId)
640
 	db = db.Where("user_org_id = ? AND status = 1", orgId)

+ 30 - 0
service/manage_center_service.go View File

315
 	err := readDb.Model(&models.XtHisAddtionConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
315
 	err := readDb.Model(&models.XtHisAddtionConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
316
 	return dealer, err
316
 	return dealer, err
317
 }
317
 }
318
+
319
+func AddSigleDiagnose(dealer *models.HisXtDiagnoseConfig) (error, *models.HisXtDiagnoseConfig) {
320
+	err := writeDb.Create(&dealer).Error
321
+	return err, dealer
322
+}
323
+
324
+func ModifyDiagnose(mesick *models.HisXtDiagnoseConfig) error {
325
+	err := writeDb.Save(&mesick).Error
326
+
327
+	return err
328
+}
329
+
330
+func FindAllDiagnoseList(orgId int64, page int64, limit int64) (list []*models.HisXtDiagnoseConfig, total int64, err error) {
331
+	offset := (page - 1) * limit
332
+	db := readDb.Model(&models.HisXtDiagnoseConfig{})
333
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
334
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
335
+	return
336
+}
337
+
338
+func DeleteDiagnoseById(id int64) error {
339
+	err := writeDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
340
+	return err
341
+}
342
+
343
+func FindDiagnoseById(id int64) (*models.HisXtDiagnoseConfig, error) {
344
+	dealer := &models.HisXtDiagnoseConfig{}
345
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
346
+	return dealer, err
347
+}