1111

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 4
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/his_api_controller.go

@@ -30,7 +30,6 @@ type HisApiController struct {
 }
 
 func HisManagerApiRegistRouters() {
-
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
 	beego.Router("/api/diag/upload", &HisApiController{}, "get:GetUploadDiag")
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
@@ -39,17 +38,10 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/checkdetailaccount/get", &HisApiController{}, "get:GetCheckDetailAccount")
 	beego.Router("/api/refund/post", &HisApiController{}, "get:Refund")
 	beego.Router("/api/sscard", &HisApiController{}, "get:Sscard")
-
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "get:RefundNumber")
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "get:RefundDetail")
-
-	//beego.Router("/api/code/get", &HisApiController{}, "get:GetCode")
-
 	beego.Router("/api/treatment/check", &HisApiController{}, "get:CheckTreatment")
-
 	beego.Router("/api/record/put", &HisApiController{}, "get:PutRecord")
-	//beego.Router("/api/returnrecord/put", &HisApiController{}, "get:ReturnRecord")
-
 }
 
 func (c *HisApiController) Sscard() {
@@ -148,7 +140,6 @@ func GetBasBaseInfo() (jsonStr string, err error) {
 	str1 := make([]byte, 256)
 	r, _, _ := ReadCardBas.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
 
-	fmt.Println(string(str))
 	fmt.Println(r)
 	return string(str), nil
 }
@@ -161,7 +152,6 @@ func GetSFZBaseInfo() (jsonStr string, err error) {
 	str1 := make([]byte, 256)
 	r, _, _ := ReadCardBas.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
 
-	fmt.Println(string(str))
 	fmt.Println(r)
 	return string(str), nil
 }
@@ -599,8 +589,8 @@ func (c *HisApiController) GetRegisterInfo() {
 			count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
-			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
-			sickConfig, _ := service.FindSickById(patientPrescription.SickType)
+			//diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
+			//sickConfig, _ := service.FindSickById(patientPrescription.SickType)
 
 			IdCardNo := ""
 			if id_card_type == 1 {
@@ -669,53 +659,53 @@ func (c *HisApiController) GetRegisterInfo() {
 				his.Status = 1
 				err := service.CreateHisPatientTwo(&his)
 				if err == nil {
-					api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
-						"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-						"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-						"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
-					resp2, requestErr2 := http.Get(api2)
-					if requestErr2 != nil {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-					if ioErr2 != nil {
-						utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					var respJSON2 map[string]interface{}
-					if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
-					userJSONBytes2, _ := json.Marshal(respJSON2)
-
-					var res2 ResultSix
-					if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res2.Infcode == -1 {
-						adminUser := c.GetAdminUserInfo()
-						errlog := &models.HisOrderError{
-							UserOrgId:  adminUser.CurrentOrgId,
-							Ctime:      time.Now().Unix(),
-							Mtime:      time.Now().Unix(),
-							ErrMsg:     res2.ErrMsg,
-							Status:     1,
-							PatientId:  id,
-							RecordTime: recordDateTime,
-							Stage:      3,
-						}
-						service.CreateErrMsgLog(errlog)
-
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
-						return
-					}
+					//api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
+					//	"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
+					//	"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+					//	"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
+					//resp2, requestErr2 := http.Get(api2)
+					//if requestErr2 != nil {
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					//	return
+					//}
+					//body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+					//if ioErr2 != nil {
+					//	utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					//	return
+					//}
+					//var respJSON2 map[string]interface{}
+					//if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+					//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					//	return
+					//}
+					//respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
+					//userJSONBytes2, _ := json.Marshal(respJSON2)
+					//
+					//var res2 ResultSix
+					//if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+					//	utils.ErrorLog("解析失败：%v", err)
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					//	return
+					//}
+					//if res2.Infcode == -1 {
+					//	adminUser := c.GetAdminUserInfo()
+					//	errlog := &models.HisOrderError{
+					//		UserOrgId:  adminUser.CurrentOrgId,
+					//		Ctime:      time.Now().Unix(),
+					//		Mtime:      time.Now().Unix(),
+					//		ErrMsg:     res2.ErrMsg,
+					//		Status:     1,
+					//		PatientId:  id,
+					//		RecordTime: recordDateTime,
+					//		Stage:      3,
+					//	}
+					//	service.CreateErrMsgLog(errlog)
+					//
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
+					//	return
+					//}
 
 					c.ServeSuccessJSON(map[string]interface{}{
 						"his_info": his,
@@ -817,28 +807,33 @@ func (c *HisApiController) GetUploadInfo() {
 
 	var prescriptions []*models.HisPrescription
 
+	var start_time int64
+	var end_time int64
+
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
 		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
 		data["pre"] = prescriptions
 
 	} else { //月结
-		start_time := c.GetString("start_time")
-		end_time := c.GetString("end_time")
+		start_time_str := c.GetString("start_time")
+		end_time_str := c.GetString("end_time")
 		timeLayout := "2006-01-02"
 		loc, _ := time.LoadLocation("Local")
-		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		recordStartTime := theStartTime.Unix()
-		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		start_time = recordStartTime
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		recordEndTime := theEndTime.Unix()
+		end_time = recordEndTime
 		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
 		data["pre"] = prescriptions
 
@@ -926,6 +921,9 @@ func (c *HisApiController) GetUploadInfo() {
 				MedicalInsurancePrice: medical_insurance_price,
 				PrivatePrice:          private_price,
 				IsMedicineInsurance:   1,
+				SettleType:            settle_accounts_type,
+				SettleStartTime:       start_time,
+				SettleEndTime:         end_time,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
@@ -2253,6 +2251,11 @@ func (c *HisApiController) PutRecord() {
 func (c *HisApiController) GetUploadDiag() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
+
+	diagnosis_id, _ := c.GetInt64("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("reg_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
@@ -2260,19 +2263,25 @@ func (c *HisApiController) GetUploadDiag() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
+	var patientPrescription models.HisPrescriptionInfo
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+	patientPrescription, _ = service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+
+	if patientPrescription.ID == 0 {
+		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+	}
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
-	diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
+	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
 	his, _ := service.GetVMHisPatientInfo(adminInfo.CurrentOrgId, id, recordDateTime)
-	sickConfig, _ := service.FindSickById(patientPrescription.SickType)
+	sickConfig, _ := service.FindSickById(sick_type)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
 	api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 		"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-		"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+		"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
 	resp2, requestErr2 := http.Get(api2)
 	if requestErr2 != nil {
@@ -2318,6 +2327,10 @@ func (c *HisApiController) GetUploadDiag() {
 		return
 	}
 
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "上传成功",
+	})
+
 }
 
 func PathExists(path string) (bool, error) {

models/his_models.go

@@ -649,6 +649,10 @@ type HisOrder struct {
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
 
+	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`