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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true

controllers/sg/his_api_controller.go

@@ -1658,14 +1658,12 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			fmt.Println(insutype)
-
 			if count == 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
 				return
 			}
 			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-				"390" + "&psn_no=" + res.Output.Baseinfo.PsnNo +
+				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)
 			resp, requestErr := http.Get(api)
@@ -2148,8 +2146,6 @@ func (c *HisApiController) GetUploadInfo() {
 					insutype = "310"
 				}
 
-				fmt.Println(insutype)
-				insutype = "390"
 				if his.IdCardType == 1 {
 					cert_no = his.MedicalInsuranceNumber
 

routers/router.go

@@ -4,6 +4,8 @@ import (
 	//"gdyb/controllers/sz"
 
 	"gdyb/controllers/sg"
+	"gdyb/controllers/zh"
+
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -25,6 +27,6 @@ func init() {
 	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	//zh.ZHHisManagerApiRegistRouters()
+	zh.ZHHisManagerApiRegistRouters()
 
 }