Merge branch 'master' of http://git.shengws.com/csx/gdyb

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -1644,6 +1644,7 @@ func (c *HisApiController) GetRegisterInfo() {
 		return
 	}
 	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 
 	if config.IsOpen == 1 {
 		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
@@ -1777,7 +1778,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
 				insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
+				"&dept=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1835,7 +1836,8 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.UserOrgId = adminInfo.CurrentOrgId
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
-			his.Status = 1
+			his.Status = 0
+			service.CreateHisPatientTwo(&his)
 
 			lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
 			if len(lists) == 1 {
@@ -1893,7 +1895,9 @@ func (c *HisApiController) GetRegisterInfo() {
 					return
 
 				} else {
-					service.CreateHisPatientTwo(&his)
+					his.Status = 1
+					service.UpdateHisPatientStatus(&his)
+
 					c.ServeSuccessJSON(map[string]interface{}{
 						"his_info": his,
 					})

service/his_service.go

@@ -1189,3 +1189,7 @@ func GetDeviceNumberByID(bed_id int64, org_id int64) (device_number models.Devic
 	err = readDb.Model(&models.DeviceNumber{}).Where("id = ? AND org_id = ?", bed_id, org_id).First(&device_number).Error
 	return
 }
+
+func UpdateHisPatientStatus(his *models.VMHisPatient) {
+	writeDb.Save(&his)
+}