jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 13b60f6d8ebc4b963c8c9f97daeb890b5c17dfbe

Authored by dongqin
2 parents 5f55300b44 f251e7ab01
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 13b60f6
... ... @@ -26,7 +26,7 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   - 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);
  29 + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89", key);
30 30 System.out.println("解密后：" + json);
31 31  
32 32 }
platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java View file @ 13b60f6
... ... @@ -71,6 +71,7 @@
71 71 DiagnoseConfigModel("DiagnoseConfigModel", 97531039990L),
72 72 DiagnoseItemModel("DiagnoseItemModel", 97531039590L),
73 73 CancerScreeningModel("CancerScreeningModel", 97531039591L),
  74 + TrackDownRecord("TrackDownRecord", 87531039591L),
74 75  
75 76 CourseModel("CourseModel", 97531029990L),
76 77 CourseEvaluateModel("CourseEvaluateModel", 97531059990L),
platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 13b60f6
... ... @@ -6,7 +6,6 @@
6 6 import org.springframework.data.mongodb.core.mapping.Document;
7 7  
8 8 import java.util.Date;
9   -import java.util.Map;
10 9  
11 10 /**
12 11 * 居民健康档案(妇女健康 )模型
... ... @@ -831,6 +830,8 @@
831 830 record.setStatus(1);
832 831 record.setSex(sex);
833 832 record.setTrackType(TrackDownDateEnums.A.getId());
  833 + record.setWomanBuildTime(buildDay);
  834 + record.setAppointmentDate(buildDay);
834 835 return record;
835 836 }
836 837 }
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java View file @ 13b60f6
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.beans.SerialIdEnum;
3 4 import com.lyms.platform.common.result.BaseModel;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
... ... @@ -22,6 +23,8 @@
22 23 @Document(collection = "lyms_trackdown_record")
23 24 public class TrackDownRecord extends BaseModel {
24 25  
  26 + private static final long serialVersionUID = SerialIdEnum.TrackDownRecord.getCid();
  27 +
25 28 private String id;
26 29 private String username;
27 30 private String source;
... ... @@ -43,6 +46,7 @@
43 46 private String parentId;
44 47 //妇女建档id
45 48 private String residentsArchiveId;
  49 + private Date womanBuildTime;
46 50 private String pid;
47 51 private Date modified;
48 52 private String hospitalId;
... ... @@ -61,6 +65,14 @@
61 65  
62 66 //是否终止流程
63 67 private String stop;
  68 +
  69 + public Date getWomanBuildTime() {
  70 + return womanBuildTime;
  71 + }
  72 +
  73 + public void setWomanBuildTime(Date womanBuildTime) {
  74 + this.womanBuildTime = womanBuildTime;
  75 + }
64 76  
65 77 public String getStop() {
66 78 return stop;
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ 13b60f6
... ... @@ -374,9 +374,11 @@
374 374 }
375 375 if (null != followupStatus) {
376 376 if (followupStatus == 0) {
377   - condition = condition.and("appointmentDate", new Date(), MongoOper.GT);
  377 + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  378 + condition = condition.and("appointmentDate", newDate, MongoOper.GTE);
378 379 } else if (followupStatus == 1) {
379   - condition = condition.and("appointmentDate", new Date(), MongoOper.LT);
  380 + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  381 + condition = condition.and("appointmentDate", newDate, MongoOper.LT);
380 382 } else if (followupStatus == 2) {
381 383 condition = condition.and("stop", "1", MongoOper.IS);
382 384 }
383 385  
384 386  
... ... @@ -412,16 +414,16 @@
412 414  
413 415 if (null != foundStart) {
414 416 if (null != c1) {
415   - c1 = c1.and("created").gte(foundStart);
  417 + c1 = c1.and("womanBuildTime").gte(foundStart);
416 418 } else {
417   - c1 = Criteria.where("created").gte(foundStart);
  419 + c1 = Criteria.where("womanBuildTime").gte(foundStart);
418 420 }
419 421 }
420 422 if (null != foundEnd) {
421 423 if (c1 != null) {
422 424 c1 = c1.lte(foundEnd);
423 425 } else {
424   - c1 = Criteria.where("created").lte(foundEnd);
  426 + c1 = Criteria.where("womanBuildTime").lte(foundEnd);
425 427 }
426 428 }
427 429  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java View file @ 13b60f6
... ... @@ -3,7 +3,9 @@
3 3 import com.lyms.platform.pojo.BasicConfig;
4 4 import net.sourceforge.pinyin4j.PinyinHelper;
5 5 import org.apache.log4j.Logger;
  6 +import sun.misc.Unsafe;
6 7  
  8 +import java.lang.reflect.Field;
7 9 import java.util.*;
8 10  
9 11 /**
10 12  
11 13  
12 14  
... ... @@ -12,25 +14,9 @@
12 14 public class Test {
13 15  
14 16 private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
15   -
16 17 public static void main(String[] args) throws Exception {
17   - int MAXIMUM_CAPACITY = 1 << 30;
18   - int n = 11 - 1;
19   - n |= n >>> 1;
20   - n |= n >>> 2;
21   - n |= n >>> 4;
22   - n |= n >>> 8;
23   - n |= n >>> 16;
24   - int a = (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1;
25   - System.out.println(a);
26 18  
27   - LinkedHashMap map = new LinkedHashMap<>();
28   -
29   - map.put("a","A");
30   - map.put("b","B");
31   - map.put("c","C");
32 19 }
33   -
34 20  
35 21 public static Integer getLevel(Integer total) {
36 22 if (total == null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ 13b60f6
... ... @@ -132,10 +132,11 @@
132 132 @RequestParam("sortType") Integer sortType,
133 133 @RequestParam(required = false) String phone,
134 134 @RequestParam(required = false) String cardNo,
  135 + @RequestParam(required = false) String userName,
135 136 @RequestParam(defaultValue = "1") Integer perType,//默认孕妇
136 137 HttpServletRequest request) {
137 138 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
138   - return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, loginState.getId());
  139 + return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, userName,loginState.getId());
139 140 }
140 141  
141 142  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 13b60f6
... ... @@ -88,13 +88,13 @@
88 88 * @param perType 2-儿童，其他是孕妇
89 89 * @return
90 90 */
91   - public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType, Integer userId) {
  91 + public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
92 92  
93 93 List<CheckByDate> checkByDate = new ArrayList<CheckByDate>();
94 94 //根据用户id获取医院ID
95 95 String hospitalId = autoMatchFacade.getHospitalId(userId);
96 96  
97   - List<CheckResponse> result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType);
  97 + List<CheckResponse> result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType, userName);
98 98  
99 99 //排序检查大项
100 100 sortLis(result);
... ... @@ -232,7 +232,7 @@
232 232 * @param perType 2-儿童
233 233 * @return
234 234 */
235   - public List<CheckResponse> queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType) {
  235 + public List<CheckResponse> queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType,String userName) {
236 236  
237 237 //保存这个人在所有医院的lis记录
238 238 List<CheckResponse> result = new ArrayList<>();
239 239  
... ... @@ -247,7 +247,12 @@
247 247  
248 248 LisReportQuery model = new LisReportQuery();
249 249  
  250 + if (StringUtils.isNotEmpty(userName))
  251 + {
  252 + model.setName(userName);
  253 + }
250 254  
  255 +
251 256 if (perType == 2) {//儿童
252 257 model.setHospitalId(hospitalId);
253 258 //通过就诊卡号和医院id查询到医院下面的lis记录
... ... @@ -442,6 +447,7 @@
442 447 {
443 448 return reportModelList;
444 449 }
  450 +
445 451  
446 452 List<LisReportModel> lises = lisService.queryLisDataByModel(model);
447 453 if (CollectionUtils.isNotEmpty(lises)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 13b60f6
... ... @@ -739,7 +739,7 @@
739 739 query.setCertNo(certNo);
740 740 }
741 741  
742   - query.setHospitalId(hospitalId);
  742 + query.setHospitalId(hospitalId.trim());
743 743 query.setNeed("true");
744 744 query.setSort(" created desc ");
745 745 List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 13b60f6
... ... @@ -31,6 +31,7 @@
31 31 import javax.annotation.PostConstruct;
32 32 import javax.servlet.ServletOutputStream;
33 33 import javax.servlet.http.HttpServletResponse;
  34 +import java.text.SimpleDateFormat;
34 35 import java.util.*;
35 36  
36 37  
37 38  
... ... @@ -471,8 +472,8 @@
471 472 downRecordQuery.setNeed("1");
472 473 // downRecordQuery.setSort("modified desc");
473 474 downRecordQuery.setHospitalId(hospitalId);
474   - System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery());
475 475  
  476 +
476 477 return downRecordQuery;
477 478 }
478 479  
... ... @@ -637,10 +638,6 @@
637 638 List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
638 639 List<Map> data = new ArrayList<>();
639 640 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
640   - /**临时处理*/
641   - if (null == downQueryRequest.getEncryption()) {
642   - downQueryRequest.setEncryption(0);
643   - }
644 641 if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
645 642 for (TrackDownRecord trackDownRecord : downRecordList) {
646 643 //追访类型
... ... @@ -821,7 +818,7 @@
821 818 // 预约时间
822 819 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate()));
823 820 //孕妇建档日期
824   - temp.put("womanCreatedTime", downRecord.getCreated());
  821 + temp.put("womanCreatedTime", downRecord.getWomanBuildTime());
825 822 return temp;
826 823 }
827 824 }
... ... @@ -857,7 +854,7 @@
857 854  
858 855  
859 856 //孕妇建档时间
860   - temp.put("womanCreatedTime", DateUtil.getyyyy_MM_dd(downRecord.getCreated()));
  857 + temp.put("womanCreatedTime", downRecord.getWomanBuildTime() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getWomanBuildTime()));
861 858 return temp;
862 859 }
863 860 }
... ... @@ -1045,7 +1042,6 @@
1045 1042  
1046 1043  
1047 1044 }
1048   -
1049 1045  
1050 1046 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java View file @ 13b60f6
... ... @@ -51,7 +51,7 @@
51 51 */
52 52 //妇女建档开始日期
53 53 private Date foundDateStart;
54   - //结束日期
  54 + //妇女建档结束日期
55 55 private Date foundDateEnd;
56 56  
57 57 //预约开始追访日期
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 13b60f6
... ... @@ -53,8 +53,8 @@
53 53 // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
54 54 urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
55 55 urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
56   - urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
57   - urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院");
  56 + // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
  57 + // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院");
58 58 urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
59 59 urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑");
60 60 urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统");
... ... @@ -227,7 +227,7 @@
227 227 public static void main(String[] args)
228 228 {
229 229 try {
230   - String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXIgKGlkLHBlcnNvbl9pZCxjcmVhdGVfZGF0ZSxjcmVhdGVfdXNlcl9pZCxjcmVhdGVfaG9zcGl0YWxfaWQsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLGhpZ2hfcmlza19jYXVzZSxzdGF0dXMsYmFieV9wYXRpZW50X2lkLGFkbWlzc19ubyxkaXNjaGFyZ2VfZGlhZ25vc2lzLGJhcl9jb2RlLG5hdGlvbixtaGlnaF9yaXNrX2ZhY3Rvcl9pZCkgdmFsdWVzICgnOGFiZmU4YWJkZDFmNGUxYTlhYTQ0MzlmODI4NTMzYWUnLCc1YWQ1ZDlhZGU0YjBlMzU1OTY0NjJlOGMnLCcyMDE4LTQtMTcgMTk6Mjg6MDcnLCdhOWU1NTA3Zi1lN2RhLTRlYzYtYjhkYi05YTFlNGQxYjdjMjknLCcyMTAwMDAxNjk5JywnMjAxOC00LTE3IDE5OjI4OjA3JywnMjEwMDAwMjk3NycsJzIxMDAwMDE2OTknLCcsMCwnLDEsJzVhZDVkOWFkZTRiMGUzNTU5NjQ2MmU4ZScsbnVsbCxudWxsLG51bGwsJ2Q4NjVkNGY0LTQyNzktNDQ3NS04MjMxLWJjNzJiYTQ0ZjY3MScsJyxkNDJlZWMwMy1hYTg2LTQ1YjgtYTRlMC03OGEwZmYzNjVmYjYsJyk";
  230 + String json = "26EB0301C4A2410E90985A3E55856E4B394230836B32B93AD3C083D37C3C4E0BEA7B0DB8B7C18941599742DD2315584A";
231 231 String data = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016");
232 232 data = LymsEncodeUtil.aesDecrypt(data,"Lymsh@2016");
233 233 data = new String(data.getBytes("utf-8"));