diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 48b1c3d..28c374d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -26,7 +26,7 @@ public class LymsEncodeUtil { //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); - String json = aesDecrypt("", key); + String json = aesDecrypt("ABXNyAChjb20ubHltcy5wbGF0Zm9ybS5wb2pvLlByZW1hcml0YWxDaGVja3VwAAAAFrVM9ewCAJRMAAhiYWlYaUJhb3QAEkxqYXZhL2xhbmcvU3RyaW5nO0wABWJhb1BpdAATTGphdmEvbGFuZy9JbnRlZ2VyO0wABWJpSGFucQB+AAFMAAZiaWFuU2VxAH4AAkwADWJpYW5TZURldGFpbHNxAH4AAUwAB2JpbmdHYW5xAH4AAUwACWJsb29kc2hlZHEAfgABTAACYnBxAH4AAUwABWJ1V2VpcQB+AAFMAA5jZXJ0aWZpY2F0ZU51bXEAfgABTAARY2VydGlmaWNhdGVUeXBlSWRxAH4AAUwAC2NoaWxkcmVuTnVtcQB+AAJMAAdjcmVhdGVkdAAQTGphdmEvdXRpbC9EYXRlO0wADWRlbGl2ZXJTdGF0dXNxAH4AAkwAA2ZlaXEAfgACTAAKZmVpRGV0YWlsc3EAfgABTAAFZmVuQnVxAH4AAUwABWZ1R2FvcQB+AAJMAAhmdUdhb1lvdXEAfgABTAAIZnVHYW9adW9xAH4AAUwABmZ1SmlhbnEAfgABTAADZ2FucQB+AAFMAAZnYW5KdWVxAH4AAUwABmdhb1dhbnEAfgACTAAJZ2FvV2FuWW91cQB+AAFMAAlnYW9XYW5adW9xAH4AAUwACWdjRmVuTWlXdXEAfgABTAAIZ2NGdUppYW5xAH4AAUwACGdjV2FpWWlucQB+AAFMAAhnY1ppR29uZ3EAfgABTAAIZ29uZ0ppbmdxAH4AAUwAC2dyYW5kcGFyZW50cQB+AAJMAAloZWFydFJhdGVxAH4AAUwAC2hlYXJ0Umh5dGhtcQB+AAFMAAZoZWlnaHRxAH4AAUwAA2hpdnEAfgABTAAKaG9zcGl0YWxJZHEAfgABTAAGaG91SmllcQB+AAJMAA1ob3VKaWVEZXRhaWxzcQB+AAFMAA1odW5KaWFuRG9jdG9ycQB+AAFMAAJpZHEAfgABTAALaXNCbG9vZHNoZWRxAH4AAkwAA2pCYXEAfgABTAAKakJhRGV0YWlsc3EAfgABTAAOamlCaW5nWmhlbkR1YW5xAH4AAUwACGppV2VpU3VvcQB+AAJMAAVqaVpodXEAfgACTAAMamlaaHVEZXRhaWxzcQB+AAFMAA1qaWFaaHVhbmdYaWFucQB+AAJMABRqaWFaaHVhbmdYaWFuRGV0YWlsc3EAfgABTAAOamlhbkNoYURldGFpbHNxAH4AAUwADWppYW5DaGFKaWVHdW9xAH4AAkwADmppZUhlRGFuSG9uZ1N1cQB+AAFMAAhqaW5nTHVhbnEAfgACTAAHamluZ01haXEAfgACTAAKamluZ01haVlvdXEAfgABTAAKamluZ01haVp1b3EAfgABTAARamluZ1NoZW5aaHVhbmdUYWlxAH4AAkwAGGppbmdTaGVuWmh1YW5nVGFpRGV0YWlsc3EAfgABTAAKbGFzdE1lbnNlc3EAfgABTAAEbGlZaXEAfgACTAAHbGluQmluZ3EAfgABTAAEbWFCaXEAfgACTAAFbWFvRmFxAH4AAkwADm1hcml0YWxIaXN0b3J5cQB+AAJMABRtYXRlcm5hbEdyYW5kcGFyZW50c3EAfgACTAALbWVuYXJjaGVBZ2VxAH4AAUwADG1lbm9ycmhhbGdpYXEAfgABTAAPbWVuc3RydWFsQW1vdW50cQB+AAFMAA5tZW5zdHJ1YWxDeWNsZXEAfgABTAAIbW9kaWZpZWRxAH4AA0wACW5leHRPZktpbnEAfgACTAAQbmlhb0NoYW5nR3VpUWlUYXEAfgABTAAKbmlhb0RhbkJhaXEAfgABTAALbmlhb1FpYW5YdWVxAH4AAUwACG5pYW9UYW5ncQB+AAFMAApuaWFvVG9uZ1RpcQB+AAFMAAhwYXJlbnRJZHEAfgABTAAHcGFyZW50c3EAfgACTAACcGlxAH4AAUwABHBpRnVxAH4AAkwAB3BpWmhlbmdxAH4AAUwAEHByZW1hcml0YWxVcFRpbWVxAH4AA0wACXB1Ymxpc2hJZHEAfgACTAAQcWlhbkJpYW9MaW5CYUppZXEAfgABTAAGcmVuTGl1cQB+AAJMAAlyaHh1ZVhpbmdxAH4AAUwACnJ1RmFuZ0ZhWXVxAH4AAkwAEXJ1RmFuZ0ZhWXVEZXRhaWxzcQB+AAFMAA9ydVhpYW5OdlhpbmdIdWFxAH4AAkwAFnJ1WGlhbk52WGluZ0h1YURldGFpbHNxAH4AAUwABnNhbmdPdXEAfgACTAAHc2V4VHlwZXEAfgACTAAMc2hlbmdaaGlRaVRhcQB+AAFMAAhzaGlMaVlvdXEAfgABTAAIc2hpTGladW9xAH4AAUwADHNoaVlhbkppZUd1b3EAfgABTAAFc2laaGlxAH4AAkwACXNpWmhpUWlUYXEAfgACTAAQc2laaGlRaVRhRGV0YWlsc3EAfgABTAAUc3BvdXNlQ2VydGlmaWNhdGVOdW1xAH4AAUwAF3Nwb3VzZUNlcnRpZmljYXRlVHlwZUlkcQB+AAFMAApzcG91c2VOYW1lcQB+AAFMAA10ZVNodU1pYW5Sb25ncQB+AAJMABR0ZVNodU1pYW5Sb25nRGV0YWlsc3EAfgABTAAKdGVTaHVUaVRhaXEAfgACTAARdGVTaHVUaVRhaURldGFpbHNxAH4AAUwACHRpR2VRaVRhcQB+AAFMAAV0aVRhaXEAfgACTAAMdGlUYWlEZXRhaWxzcQB+AAFMAAl0aW5nTGlZb3VxAH4AAUwACXRpbmdMaVp1b3EAfgABTAAIdmNDYXJkTm9xAH4AAUwABndhaVlpbnEAfgABTAAGd2VpZ2h0cQB+AAFMAAh4aW9uZ0t1b3EAfgACTAAPeGlvbmdLdW9EZXRhaWxzcQB+AAFMAAh4aW9uZ1RvdXEAfgABTAAPeHVlQ2hhbmdHdWlRaVRhcQB+AAFMAAl4dWVEYW5CYWlxAH4AAUwADXh1ZUhvbmdEYW5CYWlxAH4AAUwADHh1ZU5pYW9TdURhbnEAfgABTAANeHVlUWluZ0d1QmluZ3EAfgABTAAMeHVlUWluZ0d1Q2FvcQB+AAFMAAx4dWVRaW5nSmlHYW5xAH4AAUwAB3h1ZVRhbmdxAH4AAUwACnh1ZVhpYW9CYW5xAH4AAUwAB3h1ZVhpbmdxAH4AAUwABXlhblNlcQB+AAFMAAx5aUdhbkVLYW5nVGlxAH4AAUwADnlpR2FuRUthbmdZdWFucQB+AAFMABB5aUdhbkhlWGluS2FuZ1RpcQB+AAFMAAt5aUdhbkthbmdUaXEAfgABTAANeWlHYW5LYW5nWXVhbnEAfgABTAAReWlKaWFuUWlUYURldGFpbHNxAH4AAUwAC3lpWHVlWWlKaWFucQB+AAJMAAZ5aW5EYW9xAH4AAUwACnlpbkRhb1FpVGFxAH4AAUwABnlpbk1hb3EAfgACTAACeW5xAH4AAkwAC3l1WWFuTmVuZ0xpcQB+AAJMABJ5dVlhbk5lbmdMaURldGFpbHNxAH4AAUwABXphWWlucQB+AAJMAAx6YVlpbkRldGFpbHNxAH4AAUwACXpoZW5nQ2hhbnEAfgACTAAMemhpRGFvWWlKaWFucQB+AAFMAAZ6aUdvbmdxAH4AAUwADXpvbmdEYW5Ib25nU3VxAH4AAXhyACljb20ubHltcy5wbGF0Zm9ybS5jb21tb24ucmVzdWx0LkJhc2VNb2RlbAAAAAAAAAABAgAAeHBwcHQAAHNyABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51bWJlcoaslR0LlOCLAgAAeHAAAAACcQB+AAZwcHQABTkwLzYwcQB+AAZ0ABIxMzI2MjYxOTkyMTEwNDUwMjFwcHNyAA5qYXZhLnV0aWwuRGF0ZWhqgQFLWXQZAwAAeHB3CAAAAWZchYKseHNxAH4ABwAAAAFxAH4ACXEAfgAGcQB+AAZwcHBwcHEAfgAGcHBwcHB0AAbmi5Lmn6VwcHB0AAI3NnB0AAMxNThwdAAKMjEwMDAwMTM3N3BwdAAKMjEwMDAwMjA0MnQAGDViYmQ5MmQxMGNmMmQ4OWZkOWYyYjMyNnEAfgAJcHBxAH4ABnBxAH4ACXEAfgAGcQB+AAlxAH4ABnEAfgAGcQB+AAlwcHBwcHEAfgAJcQB+AAZ0AAoyMDE4LTEwLTA3cHBwcQB+AAlxAH4ACXB0AAIxNHQAATJwdAAENS8zMHNxAH4ADHcIAAABZlyFgqx4cQB+AAlwcHBwcHQAGDViYmQ5MjM0MGNmMmQ4OWZkOWYyYjMyMnBwcQB+AAlxAH4ABnNxAH4ADHcIAAABZlmOdAB4c3EAfgAHfSt8+nBwcHBwcHBwcQB+AA5wcHBwcQB+AAlwcQB+AAZ0ABIxMzA4MjQxOTkxMDEyMjM1MTZ0ACQ3MGFlMWQ5My0yOTY0LTQ2YmMtODNmYS1iZWM5ZmY2MDViMWN0AAnoi4/kuozlrp1xAH4ACXEAfgAGcQB+AAlxAH4ABnBxAH4ACXEAfgAGcHBwcHQAAjUwcQB+AAlxAH4ABnBwcHBwcHBwcHBwcQB+AAZwcHBwcHEAfgAGcQB+AA5wcHEAfgAOcQB+AA5xAH4ACXEAfgAGcQB+AAlxAH4ABnBwcHA=+AAFMAAZiaWFuU2VxAH4AAkwADWJpYW5TZURldGFpbHNxAH4AAUwAB2JpbmdHYW5xAH4AAUwACWJsb29kc2hlZHEAfgABTAACYnBxAH4AAUwABWJ1V2VpcQB+AAFMAA5jZXJ0aWZpY2F0ZU51bXEAfgABTAARY2VydGlmaWNhdGVUeXBlSWRxAH4AAUwAC2NoaWxkcmVuTnVtcQB+AAJMAAdjcmVhdGVkdAAQTGphdmEvdXRpbC9EYXRlO0wADWRlbGl2ZXJTdGF0dXNxAH4AAkwAA2ZlaXEAfgACTAAKZmVpRGV0YWlsc3EAfgABTAAFZmVuQnVxAH4AAUwABWZ1R2FvcQB+AAJMAAhmdUdhb1lvdXEAfgABTAAIZnVHYW9adW9xAH4AAUwABmZ1SmlhbnEAfgABTAADZ2FucQB+AAFMAAZnYW5KdWVxAH4AAUwABmdhb1dhbnEAfgACTAAJZ2FvV2FuWW91cQB+AAFMAAlnYW9XYW5adW9xAH4AAUwACWdjRmVuTWlXdXEAfgABTAAIZ2NGdUppYW5xAH4AAUwACGdjV2FpWWlucQB+AAFMAAhnY1ppR29uZ3EAfgABTAAIZ29uZ0ppbmdxAH4AAUwAC2dyYW5kcGFyZW50cQB+AAJMAAloZWFydFJhdGVxAH4AAUwAC2hlYXJ0Umh5dGhtcQB+AAFMAAZoZWlnaHRxAH4AAUwAA2hpdnEAfgABTAAKaG9zcGl0YWxJZHEAfgABTAAGaG91SmllcQB+AAJMAA1ob3VKaWVEZXRhaWxzcQB+AAFMAA1odW5KaWFuRG9jdG9ycQB+AAFMAAJpZHEAfgABTAALaXNCbG9vZHNoZWRxAH4AAkwAA2pCYXEAfgABTAAKakJhRGV0YWlsc3EAfgABTAAOamlCaW5nWmhlbkR1YW5xAH4AAUwACGppV2VpU3VvcQB+AAJMAAVqaVpodXEAfgACTAAMamlaaHVEZXRhaWxzcQB+AAFMAA1qaWFaaHVhbmdYaWFucQB+AAJMABRqaWFaaHVhbmdYaWFuRGV0YWlsc3EAfgABTAAOamlhbkNoYURldGFpbHNxAH4AAUwADWppYW5DaGFKaWVHdW9xAH4AAkwADmppZUhlRGFuSG9uZ1N1cQB+AAFMAAhqaW5nTHVhbnEAfgACTAAHamluZ01haXEAfgACTAAKamluZ01haVlvdXEAfgABTAAKamluZ01haVp1b3EAfgABTAARamluZ1NoZW5aaHVhbmdUYWlxAH4AAkwAGGppbmdTaGVuWmh1YW5nVGFpRGV0YWlsc3EAfgABTAAKbGFzdE1lbnNlc3EAfgABTAAEbGlZaXEAfgACTAAHbGluQmluZ3EAfgABTAAEbWFCaXEAfgACTAAFbWFvRmFxAH4AAkwADm1hcml0YWxIaXN0b3J5cQB+AAJMABRtYXRlcm5hbEdyYW5kcGFyZW50c3EAfgACTAALbWVuYXJjaGVBZ2VxAH4AAUwADG1lbm9ycmhhbGdpYXEAfgABTAAPbWVuc3RydWFsQW1vdW50cQB+AAFMAA5tZW5zdHJ1YWxDeWNsZXEAfgABTAAIbW9kaWZpZWRxAH4AA0wACW5leHRPZktpbnEAfgACTAAQbmlhb0NoYW5nR3VpUWlUYXEAfgABTAAKbmlhb0RhbkJhaXEAfgABTAALbmlhb1FpYW5YdWVxAH4AAUwACG5pYW9UYW5ncQB+AAFMAApuaWFvVG9uZ1RpcQB+AAFMAAhwYXJlbnRJZHEAfgABTAAHcGFyZW50c3EAfgACTAACcGlxAH4AAUwABHBpRnVxAH4AAkwAB3BpWmhlbmdxAH4AAUwAEHByZW1hcml0YWxVcFRpbWVxAH4AA0wACXB1Ymxpc2hJZHEAfgACTAAQcWlhbkJpYW9MaW5CYUppZXEAfgABTAAGcmVuTGl1cQB+AAJMAAlyaHh1ZVhpbmdxAH4AAUwACnJ1RmFuZ0ZhWXVxAH4AAkwAEXJ1RmFuZ0ZhWXVEZXRhaWxzcQB+AAFMAA9ydVhpYW5OdlhpbmdIdWFxAH4AAkwAFnJ1WGlhbk52WGluZ0h1YURldGFpbHNxAH4AAUwABnNhbmdPdXEAfgACTAAHc2V4VHlwZXEAfgACTAAMc2hlbmdaaGlRaVRhcQB+AAFMAAhzaGlMaVlvdXEAfgABTAAIc2hpTGladW9xAH4AAUwADHNoaVlhbkppZUd1b3EAfgABTAAFc2laaGlxAH4AAkwACXNpWmhpUWlUYXEAfgACTAAQc2laaGlRaVRhRGV0YWlsc3EAfgABTAAUc3BvdXNlQ2VydGlmaWNhdGVOdW1xAH4AAUwAF3Nwb3VzZUNlcnRpZmljYXRlVHlwZUlkcQB+AAFMAApzcG91c2VOYW1lcQB+AAFMAA10ZVNodU1pYW5Sb25ncQB+AAJMABR0ZVNodU1pYW5Sb25nRGV0YWlsc3EAfgABTAAKdGVTaHVUaVRhaXEAfgACTAARdGVTaHVUaVRhaURldGFpbHNxAH4AAUwACHRpR2VRaVRhcQB+AAFMAAV0aVRhaXEAfgACTAAMdGlUYWlEZXRhaWxzcQB+AAFMAAl0aW5nTGlZb3VxAH4AAUwACXRpbmdMaVp1b3EAfgABTAAIdmNDYXJkTm9xAH4AAUwABndhaVlpbnEAfgABTAAGd2VpZ2h0cQB+AAFMAAh4aW9uZ0t1b3EAfgACTAAPeGlvbmdLdW9EZXRhaWxzcQB+AAFMAAh4aW9uZ1RvdXEAfgABTAAPeHVlQ2hhbmdHdWlRaVRhcQB+AAFMAAl4dWVEYW5CYWlxAH4AAUwADXh1ZUhvbmdEYW5CYWlxAH4AAUwADHh1ZU5pYW9TdURhbnEAfgABTAANeHVlUWluZ0d1QmluZ3EAfgABTAAMeHVlUWluZ0d1Q2FvcQB+AAFMAAx4dWVRaW5nSmlHYW5xAH4AAUwAB3h1ZVRhbmdxAH4AAUwACnh1ZVhpYW9CYW5xAH4AAUwAB3h1ZVhpbmdxAH4AAUwABXlhblNlcQB+AAFMAAx5aUdhbkVLYW5nVGlxAH4AAUwADnlpR2FuRUthbmdZdWFucQB+AAFMABB5aUdhbkhlWGluS2FuZ1RpcQB+AAFMAAt5aUdhbkthbmdUaXEAfgABTAANeWlHYW5LYW5nWXVhbnEAfgABTAAReWlKaWFuUWlUYURldGFpbHNxAH4AAUwAC3lpWHVlWWlKaWFucQB+AAJMAAZ5aW5EYW9xAH4AAUwACnlpbkRhb1FpVGFxAH4AAUwABnlpbk1hb3EAfgACTAACeW5xAH4AAkwAC3l1WWFuTmVuZ0xpcQB+AAJMABJ5dVlhbk5lbmdMaURldGFpbHNxAH4AAUwABXphWWlucQB+AAJMAAx6YVlpbkRldGFpbHNxAH4AAUwACXpoZW5nQ2hhbnEAfgACTAAMemhpRGFvWWlKaWFucQB+AAFMAAZ6aUdvbmdxAH4AAUwADXpvbmdEYW5Ib25nU3VxAH4AAXhyACljb20ubHltcy5wbGF0Zm9ybS5jb21tb24ucmVzdWx0LkJhc2VNb2RlbAAAAAAAAAABAgAAeHB0AAQ0LjAzcHQAAHNyABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51bWJlcoaslR0LlOCLAgAAeHAAAAACcQB+AAdwcHQABjEwNS82NXEAfgAHdAASMTMwODIzMTk5NjEyMTMyMDQ2cHNxAH4ACAAAAAFwcQB+AA1xAH4ACnEAfgAHcQB+AAdwcHBwcHEAfgAHcHBwcHBwcHBwdAACNzR0AAI3NHQAAzE1OHQAA3lpbnBwcHQACjIxMDAwMDIwMTR0ABg1YmFhMTZjMjBjZjJhYTQ5ZDNlZDQxOThxAH4ACnBwcQB+AAdwcQB+AApxAH4AB3EAfgAKcQB+AAdxAH4AB3EAfgAKcHBwcHBxAH4ACnEAfgAHdAAKMjAxOC0wOS0yM3BwcHEAfgAKcQB+AA1wdAACMTV0AAEydAAD5LitdAAEMy8zMHNyAA5qYXZhLnV0aWwuRGF0ZWhqgQFLWXQZAwAAeHB3CAAAAWZg3Tz/eHEAfgAKcHQAAS10AAEtdAABLXQAAS1wcHBxAH4ACnEAfgAHc3EAfgAZdwgAAAFmDE8QAHhwcHB0AAR5YW5ncQB+AApxAH4AB3BwcHEAfgANcHBwdAADeWlucQB+AApwcQB+AAd0ABIxMzA4MjQxOTk2MDgwMzE1NzJ0ACQ3MGFlMWQ5My0yOTY0LTQ2YmMtODNmYS1iZWM5ZmY2MDViMWN0AAnnjovplb/og5xxAH4ACnEAfgAHcQB+AApxAH4AB3BxAH4ACnEAfgAHcHBwcHQABDQ3LjVxAH4ACnEAfgAHcHQAAS1wdAADMTI2cHQAAzkuN3B0AAQ1Ny4zdAADNC4zdAADMjUydAAYNTc2OWVmMzgwY2YyMmMzMTU3NTc3NDI2cQB+AAd0AAN5aW50AAN5aW50AAN5aW50AAN5aW50AAN5aW5xAH4AB3EAfgANcHBxAH4ADXEAfgANcQB+AApxAH4AB3EAfgAKcQB+AAdwcHBw", key); System.out.println("解密后：" + json); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java index c9abcd2..5743a50 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/ConnTools.java @@ -8,10 +8,15 @@ import java.sql.SQLException; * 聊城东昌府 */ public class ConnTools { - private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver"; - private static String hisUrl = "jdbc:oracle:thin:@10.2.7.17:1521:ORCL"; - private static String hisUser = "U_LYMS"; - private static String hisPassword = "LYMS_123"; +// private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver"; +// private static String hisUrl = "jdbc:oracle:thin:@10.2.7.17:1521:ORCL"; +// private static String hisUser = "U_LYMS"; +// private static String hisPassword = "LYMS_123"; + + private static String hisDirverClassName = "com.mysql.jdbc.Driver"; + private static String hisUrl = "jdbc:mysql://119.90.57.26:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + private static String hisUser = "platform"; + private static String hisPassword = "platform123"; public static Connection makeHisConnection() { Connection conn = null; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java index e75b438..ba57bf4 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java @@ -1,5 +1,6 @@ package com.lyms.hospitalapi.lcdcf; +import com.lyms.hospitalapi.pojo.PregPatientinfo; import com.lyms.platform.common.utils.DateUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.dbutils.DbUtils; @@ -9,6 +10,7 @@ import org.springframework.stereotype.Service; import java.sql.Connection; import java.sql.SQLException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -45,6 +47,64 @@ public class LcdcfHisService { } + public List> getLcfyHis(String vcCardNo) + { +// String sql = "select * from (select id as P_ID,name as P_NAME, sex as P_SEX, idcard as P_CARDNO," +// + " birthday as BIRTH, bhnum as P_BHNUM, phone as P_MOBILEPHONE from v_patientinfo where cardno= '"+vcCardNo+"') where rownum=1"; + + String sql = "select id as P_ID,name as P_NAME, sex as P_SEX, idcard as P_CARDNO," + + " birthday as BIRTH, bhnum as P_BHNUM, phone as P_MOBILEPHONE from v_patientinfo where cardno= '"+vcCardNo+"'"; + + List> result = new ArrayList<>(); + + + Connection connection = null; + try { + connection = ConnTools.makeHisConnection(); + QueryRunner queryRunner = new QueryRunner(true); + + List list = queryRunner.query(connection, sql, new BeanListHandler(PregPatientinfo.class)); + if (list.size() > 0) { + for (PregPatientinfo info:list) { + Map map = new HashMap<>(); + map.put("bhnum", info.getP_BHNUM()); + if ("男".equals(info.getP_SEX())) { + map.put("sex", "男"); + } else if ("女".equals(info.getP_SEX())) { + map.put("sex", "女"); + } + map.put("name", info.getP_NAME()); + map.put("idCardNo", info.getP_CARDNO()); //身份证号码 + map.put("cardNo", vcCardNo);//就诊卡号 + map.put("phone", info.getP_MOBILEPHONE()); + map.put("birth", DateUtil.getyyyy_MM_dd(parseYmd(info.getBIRTH()))); + result.add(map); + } + + } + } catch (SQLException e) { + e.printStackTrace(); + } + finally + { + DbUtils.closeQuietly(connection); + } + return result; + } + + public static Date parseYmd(String s) { + SimpleDateFormat ymd = new SimpleDateFormat("yyyyMMdd"); + if (s == null) { + return null; + } + try { + return ymd.parse(s); + } catch (Exception e) { + return null; + } + } + + /** * 获取孕妇当天的lis检查项目 * @param vcCardNo diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6cf34ea..e0c3cf1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.fnfy.FnfyHisService; +import com.lyms.hospitalapi.lcdcf.LcdcfHisService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; @@ -71,6 +72,9 @@ public class BabyBookbuildingFacade { private DzfyHisService dzfyHisService; @Autowired + private LcdcfHisService lcdcfHisService; + + @Autowired private BabyBookbuildingService babyBookbuildingService; @Autowired @@ -1835,6 +1839,10 @@ public class BabyBookbuildingFacade { }else if ("6".equals(HIS_VERSION)) { map.put("hisPatient", dzfyHisService.getPatientInfoList(param.getVcCardNo())); } + else if ("2100001305".equals(param.getHospitalId()) || "1000000116".equals(param.getHospitalId())) + { + map.put("hisPatient", lcdcfHisService.getLcfyHis(param.getVcCardNo())); + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index bdf5410..21c3c40 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -161,7 +161,7 @@ public class SyncDataTaskService { else { if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals( - model.getClassName())) + model.getClassName()) || "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName())) { System.out.println("archiveData="+model.getClassName()); boo = true;